Merge remote-tracking branch 'origin/master' idea/138.947
authorAnna Kozlova <anna.kozlova@jetbrains.com>
Thu, 3 Jul 2014 18:40:45 +0000 (20:40 +0200)
committerAnna Kozlova <anna.kozlova@jetbrains.com>
Thu, 3 Jul 2014 18:40:45 +0000 (20:40 +0200)

Trivial merge