Merge branch 'master' of git.labs.intellij.net:idea/community
authorirengrig <Irina.Chernushina@jetbrains.com>
Tue, 26 Jan 2010 14:58:13 +0000 (17:58 +0300)
committerirengrig <Irina.Chernushina@jetbrains.com>
Tue, 26 Jan 2010 14:58:13 +0000 (17:58 +0300)
commit8a0e6ff92a19e01d2148e3d4997326ff59677804
tree7a336300a41e9b1816873f265614f5f47e7a6858
parentff4225aa00c36f4b2bf28180fa01eaffca4ab4c1
parent7c974f6ae8c74a7941a2e153715412f7fdd9afa9
Merge branch 'master' of git.labs.intellij.net:idea/community