Merge branch 'Indore-2017.2.x'
authorDmitry Neverov <dmitry.neverov@gmail.com>
Sat, 16 Dec 2017 17:41:39 +0000 (18:41 +0100)
committerDmitry Neverov <dmitry.neverov@gmail.com>
Sat, 16 Dec 2017 17:41:39 +0000 (18:41 +0100)
commita94a957bfa2f2290ed9b270e8b07e01076a79cdf
tree28b6fa759455fff3f98c9294f125e0dde4ca61dc
parent4765b5d91adb5045546306df6362708673d9be80
parentd0782b6dca8ca10c004f021b306cbc196d1af1e9
Merge branch 'Indore-2017.2.x'