Merge branch 'Indore-2017.2.x'
authorDmitry Neverov <dmitry.neverov@gmail.com>
Thu, 18 Jan 2018 13:16:26 +0000 (14:16 +0100)
committerDmitry Neverov <dmitry.neverov@gmail.com>
Thu, 18 Jan 2018 13:16:26 +0000 (14:16 +0100)
commitcf8f4eba0f535cbd2a0edcfedaea5ef17154624a
tree965dd33fcacbbda59c032c2804631230872b22ca
parentc8a806f6133f23418e3277f9d1a1d99b6fe5ac52
parent69e133a2c19bfbc051045798ff706eb531fc4981
Merge branch 'Indore-2017.2.x'