Merge branch 'Indore-2017.2.x'
authorDmitry Neverov <dmitry.neverov@gmail.com>
Thu, 25 Jan 2018 13:17:37 +0000 (14:17 +0100)
committerDmitry Neverov <dmitry.neverov@gmail.com>
Thu, 25 Jan 2018 13:17:37 +0000 (14:17 +0100)
commitc0ad4484713c3b04933616347691bbce54dbc88a
tree605ba9ea829ff13ecdb88099d05ab22e3097c61f
parent6ba7e4a0238d48e87e936cbf89a73dbe4fbe8174
parent8ba349c3a0c05071b81472a1f317d94bc6bcd95c
Merge branch 'Indore-2017.2.x'