Merge branch 'master' of git.labs.intellij.net:idea/community
authorKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Tue, 20 Jul 2010 14:23:32 +0000 (18:23 +0400)
committerKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Tue, 20 Jul 2010 14:23:32 +0000 (18:23 +0400)
commit4196c7fd590c0aeecd350d431f45bf423937b169
tree4bfcddcfca9b9c192c878ad8d01776bbbdcca4e8
parenta907766a0324aaf5424fbccf192a46c0ac811492
parent383ac1f0a3cb011f28697ac12fe8a9bd8c716dae
Merge branch 'master' of git.labs.intellij.net:idea/community