Merge branch 'asa-db-mods'
authorAlex Dehnert <adehnert@mit.edu>
Mon, 6 Jun 2011 06:34:19 +0000 (02:34 -0400)
committerAlex Dehnert <adehnert@mit.edu>
Mon, 6 Jun 2011 06:34:19 +0000 (02:34 -0400)
commite0a19eeb83dbaaf4706a98f8b3656b05201e5b21
treeeda9c65daef4c18c2b1776fc661cfce0b53fb83a
parent3b7fb1861b41ba73d8de406d6b071ddfb30c0ebd
parent6e5f75cd24ff17ae694e385aa066f34a0d325e1f
Merge branch 'asa-db-mods'
django/mit/__init__.py