Merge branch 'master' into dsl
authorMaxim Medvedev <maxim.medvedev@jetbrains.com>
Wed, 4 Aug 2010 08:06:50 +0000 (12:06 +0400)
committerMaxim Medvedev <maxim.medvedev@jetbrains.com>
Wed, 4 Aug 2010 08:06:50 +0000 (12:06 +0400)
commit8eae15b4cd840d44521e5ec85ffc9365c1822fe6
treee529a1f971a77145db49b79a9661bd45df95e4e9
parent4a96205dc1fc2ab6272e64e8821e5e3233373fff
parent5bc628ccc2122628055e17d53a8a0e2f737e60d6
Merge branch 'master' into dsl