Merge remote-tracking branch 'origin/master'
authorirengrig <Irina.Chernushina@jetbrains.com>
Tue, 7 Apr 2015 12:51:11 +0000 (14:51 +0200)
committerirengrig <Irina.Chernushina@jetbrains.com>
Tue, 7 Apr 2015 12:51:11 +0000 (14:51 +0200)

Trivial merge