Merge branch 'medvedev/OC-12584'
authorMax Medvedev <maxim.medvedev@jetbrains.com>
Thu, 11 Feb 2016 16:56:51 +0000 (19:56 +0300)
committerMax Medvedev <maxim.medvedev@jetbrains.com>
Thu, 11 Feb 2016 16:56:51 +0000 (19:56 +0300)
commit29bd3f756e8efbab7b422d243688b7a94a4ace3a
treef9e45254d693ca3798a90b5568d44c93affb0d7e
parent5b2bd241de53d8ae095ba9d5211f2e20693c1072
parentf910049f53fc1678faf6cafcaa755ff17985cd77
Merge branch 'medvedev/OC-12584'