Merge remote branch 'origin/master'
authorirengrig <Irina.Chernushina@jetbrains.com>
Mon, 22 Apr 2013 12:44:16 +0000 (16:44 +0400)
committerirengrig <Irina.Chernushina@jetbrains.com>
Mon, 22 Apr 2013 12:44:16 +0000 (16:44 +0400)

Trivial merge