Merge branch 'Indore-2017.2.x'
authorDmitry Neverov <dmitry.neverov@gmail.com>
Wed, 10 Jan 2018 11:48:53 +0000 (12:48 +0100)
committerDmitry Neverov <dmitry.neverov@gmail.com>
Wed, 10 Jan 2018 11:48:53 +0000 (12:48 +0100)
commitfa716a7dcd3807c2c84f8d2560c889a71c309c99
tree2edaf021aa779684f2444607bddcb4657a3072a2
parent4f0ba90facd2ec419ebdb720e3325d276957e4cd
parent792a3c75be370173ba5df6f4f958e0ef5e4afb9e
Merge branch 'Indore-2017.2.x'