Merge branch 'master' of git.labs.intellij.net:idea/community
authorDmitry Jemerov <yole@jetbrains.com>
Fri, 12 Nov 2010 09:22:57 +0000 (12:22 +0300)
committerDmitry Jemerov <yole@jetbrains.com>
Fri, 12 Nov 2010 09:22:57 +0000 (12:22 +0300)
commitd9e4482d7dc2acc4abe61fa4b532a9a85ae3f725
treee65edafbadbaefb14062af7429fcea70bf97c763
parent80e638dc37d2da5991a8bc539b42ff0c7ace5ffc
parent55e0d6c2ebee46e0008e7a4662c0d6031bcc30a6
Merge branch 'master' of git.labs.intellij.net:idea/community