Merge 'remotes/trunk'
commit092ab46da67a28273d11ad7dc5e555449a3cae19
authorna-Itms <na.itms76@gmail.com>
Fri, 26 May 2017 03:00:24 +0000 (26 05:00 +0200)
committerna-Itms <na.itms76@gmail.com>
Fri, 26 May 2017 03:00:24 +0000 (26 05:00 +0200)
treec8104bb96d50fd676daf960002af84513784e592
parent23e664f4877d39bae15a4f2215481bfa6f525264
parent2414ff86aba675d259c1d95f1184b003c98b054e
Merge 'remotes/trunk'