Merge branch 'master' of git.labs.intellij.net:idea/community
authorKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Fri, 10 Dec 2010 14:18:00 +0000 (17:18 +0300)
committerKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Mon, 13 Dec 2010 08:03:48 +0000 (11:03 +0300)
commitd0ae196bf2ec7b35c2675b30219647a777d362a3
tree368c3fa3ed6b13504db58f45f2e0aa4df7caef81
parentf29f249265e49ed9ea44bf5b65a17d04a0328f44
parentd5cd85891ecbf0c7ab076f3cad32d1bbd0e8488c
Merge branch 'master' of git.labs.intellij.net:idea/community