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

Trivial merge