Merge 'remotes/trunk'
commit627871a0132c980e8cbce43554dfaff2b2ba1c90
authorna-Itms <na.itms76@gmail.com>
Wed, 21 Jun 2017 03:00:26 +0000 (21 05:00 +0200)
committerna-Itms <na.itms76@gmail.com>
Wed, 21 Jun 2017 03:00:26 +0000 (21 05:00 +0200)
tree64eb1dc4d29b6113e48b4e863a40a29e946f3d1a
parent9389d2b130c41b523ca094189756455662048e71
parentd532859ea30557fec913f8b16e358f4550583c84
Merge 'remotes/trunk'