Merge branch 'master' of git.labs.intellij.net:idea/community
authorEvgeny Pasynkov <Evgeny.Pasynkov@jetbrains.com>
Tue, 13 Nov 2012 10:44:23 +0000 (11:44 +0100)
committerEvgeny Pasynkov <Evgeny.Pasynkov@jetbrains.com>
Tue, 13 Nov 2012 10:44:23 +0000 (11:44 +0100)

Trivial merge