Merge remote-tracking branch 'origin/master' idea/140.563
authorVladimir.Orlov <Vladimir.Orlov@jetbrains.com>
Thu, 13 Nov 2014 14:34:00 +0000 (17:34 +0300)
committerVladimir.Orlov <Vladimir.Orlov@jetbrains.com>
Thu, 13 Nov 2014 14:34:00 +0000 (17:34 +0300)

Trivial merge