Merge branch 'master' of git.labs.intellij.net:idea/community
authorEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Wed, 1 Dec 2010 17:54:12 +0000 (20:54 +0300)
committerEkaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Wed, 1 Dec 2010 17:54:12 +0000 (20:54 +0300)
commitbad9ad60798d9d06155ce5810a0ae22b28642c15
tree5c46b8772dea469d861672a2c336ac6af6cb9c72
parentfeb6448d55abc2fc1a9b1f2d2bc11543bacf3ce3
parent5c667269a2183b566cdc638511dacd9ba95d9c7c
Merge branch 'master' of git.labs.intellij.net:idea/community