Merge branch 'master' of git.labs.intellij.net:idea/community
authorYann Cébron <yann@yc.local>
Sun, 31 Jan 2010 12:04:55 +0000 (13:04 +0100)
committerYann Cébron <yann@yc.local>
Sun, 31 Jan 2010 12:04:55 +0000 (13:04 +0100)

Trivial merge