Merge branch 'master' of git.labs.intellij.net:idea/community
authorirengrig <Irina.Chernushina@jetbrains.com>
Fri, 29 Jan 2010 09:48:28 +0000 (12:48 +0300)
committerirengrig <Irina.Chernushina@jetbrains.com>
Fri, 29 Jan 2010 09:48:28 +0000 (12:48 +0300)
commit1ac195d08d41f67d3bdccca11271e306b5a00a4a
tree8cbcd54ddb852c2e968653361a54faa780fc7dce
parentd1afc1b59d5fecdf02b2a507ce1f0d3ebd6900eb
parent26d62866f0235651f662c6cd15e42003b4fe48f4
Merge branch 'master' of git.labs.intellij.net:idea/community