Merge remote branch 'origin/master'
authorirengrig <Irina.Chernushina@jetbrains.com>
Fri, 7 Sep 2012 10:54:01 +0000 (14:54 +0400)
committerirengrig <Irina.Chernushina@jetbrains.com>
Fri, 7 Sep 2012 10:54:01 +0000 (14:54 +0400)

Trivial merge