Merge remote branch 'origin/master'
authorirengrig <Irina.Chernushina@jetbrains.com>
Wed, 1 Feb 2012 07:17:48 +0000 (11:17 +0400)
committerirengrig <Irina.Chernushina@jetbrains.com>
Wed, 1 Feb 2012 07:17:48 +0000 (11:17 +0400)

Trivial merge