Merge branch 'master' of git.labs.intellij.net:idea/community
commitb5bb81cdfdbbe1a0c0d2b965833f8c9e7bc07afe
authorBas Leijdekkers <leijdekkers@carp-technologies.nl>
Fri, 29 Jan 2010 14:06:14 +0000 (29 15:06 +0100)
committerBas Leijdekkers <leijdekkers@carp-technologies.nl>
Fri, 29 Jan 2010 14:06:14 +0000 (29 15:06 +0100)
tree0d355a0c3def9983c1210623b47d97dbe2760a68
parent26a0482cad548f33f0795a5f81ef70c54cdc9391
parentd95a9f17457ecb8211c35f18c888c6ed90d30846
Merge branch 'master' of git.labs.intellij.net:idea/community