Merge commit 'origin/master'
authorMaxim Medvedev <maxim.medvedev@jetbrains.com>
Sat, 27 Nov 2010 18:50:41 +0000 (21:50 +0300)
committerMaxim Medvedev <maxim.medvedev@jetbrains.com>
Sat, 27 Nov 2010 18:50:41 +0000 (21:50 +0300)
commit46542b9c5f584d3c5933c7a277e79b4f16d2ed52
treeacedbcb046d85f0bdafd425891455d2b0a2908d1
parentb3fb761cc530edfb6cf1f77ad111c9f8f4513563
parentc237a18dda37180f98ff1316c8a5157171a028b6
Merge commit 'origin/master'