Merge branch 'Indore-2017.1.x'
authorDmitry Neverov <dmitry.neverov@gmail.com>
Tue, 13 Jun 2017 15:20:07 +0000 (17:20 +0200)
committerDmitry Neverov <dmitry.neverov@gmail.com>
Tue, 13 Jun 2017 15:20:07 +0000 (17:20 +0200)
commit0dde5cf9578c51717cf07f7b67ce9ca65ecc0d3f
tree9a929d7dcb835b5efd6f941d2e63e73e20c6c283
parent6691785d981ec293458950bd40a22c426f1bec5a
parent0ee48f40776e9c24bbb39c861bd64d4d7c84684d
Merge branch 'Indore-2017.1.x'