Merge branch 'master' of git.labs.intellij.net:idea/community into hs
authorpeter <peter.gromov@jetbrains.com>
Sat, 20 Mar 2010 21:06:11 +0000 (21:06 +0000)
committerpeter <peter.gromov@jetbrains.com>
Sat, 20 Mar 2010 21:06:11 +0000 (21:06 +0000)
commit29689ae419250ebbf047300a769bd00dcc0678c1
tree3533795e7a5770aa9d36394fbf2a4a2de38134e2
parent6471fc499fbdaf12f3a92f12a3fbe51f95c0c2df
parent9e558767487ce89aeddf6f9ad45062dccbcccc52
Merge branch 'master' of git.labs.intellij.net:idea/community into hs