Merge branch 'Indore-2017.1.x'
authorDmitry Neverov <dmitry.neverov@gmail.com>
Sun, 21 May 2017 08:34:57 +0000 (10:34 +0200)
committerDmitry Neverov <dmitry.neverov@gmail.com>
Sun, 21 May 2017 08:34:57 +0000 (10:34 +0200)
commitcf1d2050f41f913c634c61f1d952dacc8fd05b83
tree0058866ef630db18284a35382956fdf7fbde840b
parent54a165eb1363aa2a372347f9156ecc52207a4f5f
parenteef983dafa1f42ef5f2d95ba589326d5154e6fc7
Merge branch 'Indore-2017.1.x'