Merge 'remotes/trunk'
commitd8e4373bf1a017ce938d828bf6cbef8edf0d74ee
authorna-Itms <na.itms76@gmail.com>
Fri, 19 May 2017 03:00:26 +0000 (19 05:00 +0200)
committerna-Itms <na.itms76@gmail.com>
Fri, 19 May 2017 03:00:26 +0000 (19 05:00 +0200)
tree692ce95a4c37d5b717cb6c589620f24ec37c2e41
parent9a793c0a2cd52c26594888ffd49105c04d7404d8
parentd237c390be683a6de8d15c5f08af8adecba4ce1f
Merge 'remotes/trunk'