Merge branch 'master' of git.labs.intellij.net:idea/community
commit120060be5866cd4f3bae601d3400cdbe8b3cd98f
authorDmitry Avdeev <Dmitry.Avdeev@jetbrains.com>
Fri, 22 Jan 2010 09:59:15 +0000 (22 12:59 +0300)
committerDmitry Avdeev <Dmitry.Avdeev@jetbrains.com>
Fri, 22 Jan 2010 09:59:15 +0000 (22 12:59 +0300)
tree7170ab26d8a661aa0814eb1818c58f5c436a568d
parent9b28b08e8fbb471d68bb333ef215b3bf083e7de6
parentc51c5248026d4e01fd4cbe2698bbe425cc45c2d1
Merge branch 'master' of git.labs.intellij.net:idea/community