Merge branch 'master' of git.labs.intellij.net:idea/community
commit65584aff59f9e4c0202638a87785b9fa1fc89aea
authorBas Leijdekkers <leijdekkers@carp-technologies.nl>
Wed, 23 Dec 2009 15:52:15 +0000 (23 16:52 +0100)
committerBas Leijdekkers <leijdekkers@carp-technologies.nl>
Wed, 23 Dec 2009 15:52:15 +0000 (23 16:52 +0100)
treea864d911e5f5079301878a2b953712e51c2ad88c
parent6c83e38c91fbf6795a3f200918c44e5b974df204
parent98d931ecb0d057d84a656e83edf47ee24ed8939d
Merge branch 'master' of git.labs.intellij.net:idea/community