Merge remote branch 'origin/master'
authorirengrig <Irina.Chernushina@jetbrains.com>
Fri, 20 Jul 2012 13:41:30 +0000 (17:41 +0400)
committerirengrig <Irina.Chernushina@jetbrains.com>
Fri, 20 Jul 2012 13:41:30 +0000 (17:41 +0400)

Trivial merge