Merge 'remotes/trunk'
commitb21887998af43e867b130ea1e488b17d58bba720
authorna-Itms <na.itms76@gmail.com>
Sat, 14 Oct 2017 03:00:54 +0000 (14 05:00 +0200)
committerna-Itms <na.itms76@gmail.com>
Sat, 14 Oct 2017 03:00:54 +0000 (14 05:00 +0200)
treed3273ef804a54f0f80f21143412e5e24bafad8f4
parent7326d155148a30a1523c6bf245fdd409d61e9af4
parent59e3353ce20eaf2e37f7b79619aacafd9595559e
Merge 'remotes/trunk'