Merge 'remotes/trunk'
commit317ff25ebc55423000e245e700a38290f67c5246
authorna-Itms <na.itms76@gmail.com>
Sat, 13 May 2017 03:00:30 +0000 (13 05:00 +0200)
committerna-Itms <na.itms76@gmail.com>
Sat, 13 May 2017 03:00:30 +0000 (13 05:00 +0200)
treef10d426fb6556d06c7c69942fbf2a5ae309ca851
parentab49f867626287f458c681ce4d1facec7aa7c114
parent4bb1119b787579b5c13ef22b6b18b181b23927d4
Merge 'remotes/trunk'