Merge branch 'master' of git.labs.intellij.net:idea/community
authornik <Nikolay.Chashnikov@jetbrains.com>
Wed, 29 Dec 2010 07:27:15 +0000 (10:27 +0300)
committernik <Nikolay.Chashnikov@jetbrains.com>
Wed, 29 Dec 2010 12:26:54 +0000 (15:26 +0300)
commit12f294e5e3a693464d104e3206445a62e882c655
treef76754eef3b8c5ee9e763e3dd68f2dceb56a5120
parent1858aeb2f5790ba7134d9c5dad2e2225fd8c311c
parenta4c17eef83b8598a24b01374f0c02574131f2964
Merge branch 'master' of git.labs.intellij.net:idea/community