Merge 'remotes/trunk'
commitf850c25bacf8db8e127f710a89632cb9f3477ce6
authorna-Itms <na.itms76@gmail.com>
Thu, 29 Jun 2017 03:00:27 +0000 (29 05:00 +0200)
committerna-Itms <na.itms76@gmail.com>
Thu, 29 Jun 2017 03:00:27 +0000 (29 05:00 +0200)
tree69c92616a299007eff6165cc6dc34b602661b67d
parent068e65f1b5008bf0028d6774e6eda7b8290d4f2f
parent4f1bdbaf1cb70da1f91615b1a82f527137f44396
Merge 'remotes/trunk'