Merge branch 'master' into OC-13477 appcode/162.496
authorMax Medvedev <maxim.medvedev@jetbrains.com>
Thu, 26 May 2016 08:01:27 +0000 (11:01 +0300)
committerMax Medvedev <maxim.medvedev@jetbrains.com>
Thu, 26 May 2016 08:01:27 +0000 (11:01 +0300)
commitb1c16c3c24aaed4bc17830e7a7831e042f0b1065
tree6658c2da61de24d80f690d81aedba11269ceaab5
parent4afe03ec87b24a013c7ca390235992c3cd816a67
parente5f75bd1cac5a02d9695200c4ad82a2269138e9e
Merge branch 'master' into OC-13477