Merge branch 'Indore-2017.1.x'
authorDmitry Neverov <dmitry.neverov@gmail.com>
Mon, 19 Jun 2017 12:59:29 +0000 (14:59 +0200)
committerDmitry Neverov <dmitry.neverov@gmail.com>
Mon, 19 Jun 2017 12:59:29 +0000 (14:59 +0200)
commit6743af6ef57c9f039fa342bc34e581647bd0528e
tree8987c348113cdbc441118e86c1d35ba50fd361ac
parent0dde5cf9578c51717cf07f7b67ce9ca65ecc0d3f
parent00961fdd093f28e919fa71a60e6888354badbb03
Merge branch 'Indore-2017.1.x'