Merge remote branch 'origin/master'
authorirengrig <Irina.Chernushina@jetbrains.com>
Mon, 3 Sep 2012 14:09:44 +0000 (18:09 +0400)
committerirengrig <Irina.Chernushina@jetbrains.com>
Mon, 3 Sep 2012 14:09:44 +0000 (18:09 +0400)

Trivial merge