Merge 'remotes/trunk'
commit5ad789f67ab936d77002d12e6d8592946c03b290
authorna-Itms <na.itms76@gmail.com>
Sun, 30 Apr 2017 03:00:21 +0000 (30 05:00 +0200)
committerna-Itms <na.itms76@gmail.com>
Sun, 30 Apr 2017 03:00:21 +0000 (30 05:00 +0200)
tree5226219605ca3c7f4173f2821e3b78ec9e6a23b3
parentb7880471dadb4c5e4313bd866aa4ccc4daa7376b
parent11c122af26414e7de1cfd7822b55c40587d28408
Merge 'remotes/trunk'