Merge branch 'Indore-2017.1.x'
authorDmitry Neverov <dmitry.neverov@gmail.com>
Mon, 19 Jun 2017 15:31:05 +0000 (17:31 +0200)
committerDmitry Neverov <dmitry.neverov@gmail.com>
Mon, 19 Jun 2017 15:31:05 +0000 (17:31 +0200)
commit24d4b1d0a2e6ffe9b87e7390bb84c900b3dca41e
tree67039948a7f8645f9fc23761c3db55fbfbca72d5
parent599ed109208db245e49eb80fc2e191ee714ab37f
parent653eefec9975a9b57f51fe41315a3e76d90b4a0b
Merge branch 'Indore-2017.1.x'