Merge 'remotes/trunk'
commit9a793c0a2cd52c26594888ffd49105c04d7404d8
authorna-Itms <na.itms76@gmail.com>
Thu, 18 May 2017 03:00:21 +0000 (18 05:00 +0200)
committerna-Itms <na.itms76@gmail.com>
Thu, 18 May 2017 03:00:21 +0000 (18 05:00 +0200)
treeacbd7a30262e9ecf053b17e74ada1eb72cc22f6b
parentc40e76628f3157d83a3fd672913b17081cbd1732
parent9c71d3534b8b8a56a88b57e09770e159c352ee96
Merge 'remotes/trunk'