Merge branch 'master' of git.labs.intellij.net:idea/community
commit10e836d7e21ff9695860daa01a24ede3f5d6e343
authorKirill.Safonov <kirill.safonov@swiftteams.com>
Tue, 12 Jan 2010 11:35:38 +0000 (12 14:35 +0300)
committerKirill.Safonov <kirill.safonov@swiftteams.com>
Tue, 12 Jan 2010 11:35:38 +0000 (12 14:35 +0300)
treef58dbce80ed2ff5454deab565c3c5449dd71948a
parent1ddc49bc040dd128a5756b6d9eb05ba6e56f02b2
parent3bd66724e1a303a8b4b5fb93604595478928c092
Merge branch 'master' of git.labs.intellij.net:idea/community