Merge 'remotes/trunk'
commit3326b5a584b8fe18d5f5a25e4a3231e38ac51e5c
authorna-Itms <na.itms76@gmail.com>
Sun, 14 Aug 2016 16:21:15 +0000 (14 18:21 +0200)
committerna-Itms <na.itms76@gmail.com>
Sun, 14 Aug 2016 16:21:15 +0000 (14 18:21 +0200)
treede48d64307a312498a4eeacb19bc3026229d3474
parentd6398a1523e883fdff864da05fa4d8d27f5efd41
parenta76f8a77c552eeea7ce70dbb9f806a44f588c278
Merge 'remotes/trunk'