Merge remote branch 'origin/master'
authorirengrig <Irina.Chernushina@jetbrains.com>
Tue, 13 Nov 2012 10:02:04 +0000 (14:02 +0400)
committerirengrig <Irina.Chernushina@jetbrains.com>
Tue, 13 Nov 2012 10:02:04 +0000 (14:02 +0400)

Trivial merge