Merge branch 'master' of git@git.labs.intellij.net:idea/community
authorKirill Kalishev <kirill.kalishev@jetbrains.com>
Fri, 12 Feb 2010 10:55:11 +0000 (13:55 +0300)
committerKirill Kalishev <kirill.kalishev@jetbrains.com>
Fri, 12 Feb 2010 10:55:11 +0000 (13:55 +0300)
commita9e39e55f6a5c927e1763b97be6bb071cd0603e8
tree48cf51a5f42d27e9b46d172e921fda9dfcce7e0e
parenta0ef197bd9552505f350a2bc1c84fa0161073060
parent63c44ba7a53a8f8c88a72ebc0f23a8eb22585290
Merge branch 'master' of git@git.labs.intellij.net:idea/community