Merge branch 'Indore-2017.2.x'
authorDmitry Neverov <dmitry.neverov@gmail.com>
Wed, 10 Jan 2018 14:20:13 +0000 (15:20 +0100)
committerDmitry Neverov <dmitry.neverov@gmail.com>
Wed, 10 Jan 2018 14:20:13 +0000 (15:20 +0100)
commitc8a806f6133f23418e3277f9d1a1d99b6fe5ac52
tree4a7a4ba4190e2b45565708c86fab332077373b9b
parent2f982c76f293a09d468aa0cf013546a3249ca1fb
parentafdc6949d2cccfcd36e6dbb79f6c0c7392c0ac01
Merge branch 'Indore-2017.2.x'