Merge remote branch 'origin/master'
authorirengrig <Irina.Chernushina@jetbrains.com>
Thu, 21 Feb 2013 11:08:08 +0000 (15:08 +0400)
committerirengrig <Irina.Chernushina@jetbrains.com>
Thu, 21 Feb 2013 11:08:08 +0000 (15:08 +0400)

Trivial merge