Merge remote-tracking branch 'origin/master'
authorVladimir.Orlov <Vladimir.Orlov@jetbrains.com>
Wed, 17 Sep 2014 09:50:44 +0000 (13:50 +0400)
committerVladimir.Orlov <Vladimir.Orlov@jetbrains.com>
Wed, 17 Sep 2014 09:50:44 +0000 (13:50 +0400)

Trivial merge