Merge 'remotes/trunk'
commitab51d59830133a115eee27994e4459af804dbf82
authorna-Itms <na.itms76@gmail.com>
Tue, 4 Jul 2017 03:00:25 +0000 (4 05:00 +0200)
committerna-Itms <na.itms76@gmail.com>
Tue, 4 Jul 2017 03:00:25 +0000 (4 05:00 +0200)
treef42c10bd8b386b672c70656cd5d7402c98961e4a
parent8a4f77ca2ea5edbafb8041b72b691cc569fa9ee2
parent66cc481f29de88fdb682f13b5d9c49619309360e
Merge 'remotes/trunk'