Merge branch 'Indore-2017.1.x'
authorDmitry Neverov <dmitry.neverov@gmail.com>
Sun, 21 May 2017 07:37:39 +0000 (09:37 +0200)
committerDmitry Neverov <dmitry.neverov@gmail.com>
Sun, 21 May 2017 07:37:39 +0000 (09:37 +0200)
commit7e8cb9dc4a57c706548e75c0533ee285dbc80052
tree98d3c003ec1f175e4ec6a0650bf72da92b3678ec
parentb903fe0a5b9fed6007de6c6fc50b0bde1567a314
parent536d3d56d9c888f7a39758430d190ea901571a43
Merge branch 'Indore-2017.1.x'