Merge branch 'medvedev/oc-11785'
authorMax Medvedev <maxim.medvedev@jetbrains.com>
Wed, 4 May 2016 18:43:10 +0000 (21:43 +0300)
committerMax Medvedev <maxim.medvedev@jetbrains.com>
Wed, 4 May 2016 18:43:10 +0000 (21:43 +0300)
commit821a3a6116561a7abae30b3afd1d188bbb169a3e
tree7fe08bebf26848ed7f7fdab115789306f9d2e36a
parentc9f72daaff0e26bdfc7e740322b5e7edc756a1bb
parent27d043f14056214b02bcd22a8b8d63a8dc31ef2d
Merge branch 'medvedev/oc-11785'