Merge branch 'master' of git.labs.intellij.net:idea/community
authorsweinreuter <sascha.weinreuter@gmail.com>
Fri, 11 Feb 2011 11:00:18 +0000 (12:00 +0100)
committersweinreuter <sascha.weinreuter@gmail.com>
Fri, 11 Feb 2011 11:00:18 +0000 (12:00 +0100)

Trivial merge