From: Alex Dehnert <adehnert@mit.edu>
Date: Mon, 6 Jun 2011 06:37:44 +0000 (-0400)
Subject: Merge remote branch 'django-mit/master'
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/snippets/.git/commitdiff_plain/18302217d478bfa06109302900e2acbd46c96050

Merge remote branch 'django-mit/master'
---

18302217d478bfa06109302900e2acbd46c96050