Merge branch 'Indore-2017.1.x'
authorDmitry Neverov <dmitry.neverov@gmail.com>
Fri, 4 Aug 2017 16:06:56 +0000 (18:06 +0200)
committerDmitry Neverov <dmitry.neverov@gmail.com>
Fri, 4 Aug 2017 16:06:56 +0000 (18:06 +0200)
commite88a0dc5baf0bed2be066427660d2dcdc1fc34ed
tree50b3e24715af09704419b35aef63ef749c690e18
parent035f25e09447cd2d1aa15ecf33b6e63e7b2d39a3
parent3da212a6c7f0344c8f3aa30dfccc6a4044ecc024
Merge branch 'Indore-2017.1.x'