Merge branch 'master' of git.labs.intellij.net:idea/community
authorBas Leijdekkers <leijdekkers@carp-technologies.nl>
Thu, 19 Aug 2010 12:15:26 +0000 (14:15 +0200)
committerBas Leijdekkers <leijdekkers@carp-technologies.nl>
Thu, 19 Aug 2010 12:15:26 +0000 (14:15 +0200)
commit5594ee1dc528395d03b5e3a73f2664b41d6bc125
treef298e42c7fca43f663919acc79fd2aefd3ba348d
parent71ecefc73c4546ff85e78a3781871ee0aea6ec63
parent6a2a7efa85141a0ac71b50474069df8989a9fd30
Merge branch 'master' of git.labs.intellij.net:idea/community