Merge branch 'master' of git.labs.intellij.net:idea/community
authorMaxim Medvedev <maxim.medvedev@jetbrains.com>
Mon, 27 Dec 2010 10:42:37 +0000 (13:42 +0300)
committerMaxim Medvedev <maxim.medvedev@jetbrains.com>
Mon, 27 Dec 2010 10:42:37 +0000 (13:42 +0300)
commitae0d8490a8f83c58e69145a10c5041e250fbfc6a
treee4e8ea75bd84730a5b24360e36b93a1ff777a689
parent31adeff787ac185c13ceff65cac34dcd4a8767f3
parent0f16f64be6ada8e2ccac1399217b364320a7981f
Merge branch 'master' of git.labs.intellij.net:idea/community