Merge remote-tracking branch 'origin/master' into medvedev/oc-11785
authorMax Medvedev <maxim.medvedev@jetbrains.com>
Wed, 4 May 2016 16:55:29 +0000 (19:55 +0300)
committerMax Medvedev <maxim.medvedev@jetbrains.com>
Wed, 4 May 2016 16:55:29 +0000 (19:55 +0300)
commit27d043f14056214b02bcd22a8b8d63a8dc31ef2d
treea048d9e6cd6619fe4ab8c10a3035816ba54e0ce6
parentddaeffd9cede110a8fe0edfda9c5606b56c79dd4
parentb4cdeed35f4e1c15a3f7d22632634ef8dd46cbc7
Merge remote-tracking branch 'origin/master' into medvedev/oc-11785