Merge branch 'master' of git.labs.intellij.net:idea/community
commitd155931b4650b8ac5d7cbbb32f603aba5c1df770
authorDmitry Jemerov <yole@jetbrains.com>
Fri, 18 Dec 2009 10:57:29 +0000 (18 13:57 +0300)
committerDmitry Jemerov <yole@jetbrains.com>
Fri, 18 Dec 2009 10:57:29 +0000 (18 13:57 +0300)
tree6859c20d8ebbb247367dcacb12a7378ca841fbfd
parent0a836b9e5e7a41a6a240403d325b94c3e985de3b
parent0421af0bc17fe4a55d649675b78c00f6a006dd81
Merge branch 'master' of git.labs.intellij.net:idea/community