Merge remote branch 'origin/master'
authorirengrig <Irina.Chernushina@jetbrains.com>
Wed, 5 Sep 2012 14:19:51 +0000 (18:19 +0400)
committerirengrig <Irina.Chernushina@jetbrains.com>
Wed, 5 Sep 2012 14:19:51 +0000 (18:19 +0400)

Trivial merge