Merge remote branch 'django-mit/master'
authorAlex Dehnert <adehnert@mit.edu>
Mon, 6 Jun 2011 06:37:44 +0000 (02:37 -0400)
committerAlex Dehnert <adehnert@mit.edu>
Mon, 6 Jun 2011 06:37:44 +0000 (02:37 -0400)
commit18302217d478bfa06109302900e2acbd46c96050
tree1bbfb24449822bbd8c25d43717115e568fcf76b1
parent70f27c1685a30869e9f61a5275293a77484ae144
parente0a19eeb83dbaaf4706a98f8b3656b05201e5b21
Merge remote branch 'django-mit/master'