Merge 'remotes/trunk'
commit5efb3780aca6dead3c088db4878a7598d4e92354
authorna-Itms <na.itms76@gmail.com>
Sun, 4 Jun 2017 03:00:24 +0000 (4 05:00 +0200)
committerna-Itms <na.itms76@gmail.com>
Sun, 4 Jun 2017 03:00:24 +0000 (4 05:00 +0200)
treefffd53863f6e313e2cbc7d4a1533d2c3d98c7a1a
parentec75f37daf825880e19c9095bf06282a98c0ce1d
parentfeeac5010d72c0050ece8cc4f4aef459448189a0
Merge 'remotes/trunk'