Merge branch 'master' of git.labs.intellij.net:idea/community
authorEvgeny Pasynkov <Evgeny.Pasynkov@jetbrains.com>
Mon, 15 Oct 2012 12:30:13 +0000 (14:30 +0200)
committerEvgeny Pasynkov <Evgeny.Pasynkov@jetbrains.com>
Mon, 15 Oct 2012 12:30:13 +0000 (14:30 +0200)

Trivial merge