Merge 'remotes/trunk'
commit9a822c5b7a405951a740e40a40beffe3c582a308
authorna-Itms <na.itms76@gmail.com>
Thu, 15 Sep 2016 14:38:26 +0000 (15 16:38 +0200)
committerna-Itms <na.itms76@gmail.com>
Thu, 15 Sep 2016 14:38:26 +0000 (15 16:38 +0200)
tree814fa60a27b72ef8da600566514e4419dbee9b23
parent3f739d90c29e53222436fad567f7c0f5d9e411b8
parent506405e9b0d81547edde93bc6083995b4f82dda3
Merge 'remotes/trunk'