Merge branch 'master' of git.labs.intellij.net:idea/community
authorYann Cébron <yann@yc.local>
Thu, 19 Aug 2010 16:00:10 +0000 (18:00 +0200)
committerYann Cébron <yann@yc.local>
Thu, 19 Aug 2010 16:00:10 +0000 (18:00 +0200)

Trivial merge