Merge remote branch 'origin/master'
authorirengrig <Irina.Chernushina@jetbrains.com>
Sun, 27 Nov 2011 06:07:39 +0000 (10:07 +0400)
committerirengrig <Irina.Chernushina@jetbrains.com>
Sun, 27 Nov 2011 06:07:39 +0000 (10:07 +0400)

Trivial merge