Merge branch 'Indore-2017.2.x'
authorDmitry Neverov <dmitry.neverov@gmail.com>
Thu, 25 Jan 2018 12:42:14 +0000 (13:42 +0100)
committerDmitry Neverov <dmitry.neverov@gmail.com>
Thu, 25 Jan 2018 12:42:14 +0000 (13:42 +0100)
commit6ba7e4a0238d48e87e936cbf89a73dbe4fbe8174
tree9b15352637054347d4fb505e779e01ff8825281c
parent37a85b26ab6a76b3e18c69590693456d72648b7c
parent5f22c2fb61b8048631a098f68a53e2682207a374
Merge branch 'Indore-2017.2.x'