Merge commit 'origin/master'
authorMaxim Medvedev <maxim.medvedev@jetbrains.com>
Sat, 17 Jul 2010 13:20:02 +0000 (17:20 +0400)
committerMaxim Medvedev <maxim.medvedev@jetbrains.com>
Sat, 17 Jul 2010 13:20:02 +0000 (17:20 +0400)
commita88889d8fda3c12e5d3d53c05291cdac23de5214
tree21a1af5c8395e409afee69472fe4d235eb90eb08
parent3cfc5f968ddc2578793d13aee846be019ac13234
parent12b74184b6f7c720ae23dd13291192b8903e562b
Merge commit 'origin/master'