Merge branch 'new_metadata'

Conflicts: requirements/development.txt requirements/production.txt settings.py
2011-05-21 00:13:38 -04:00
parent 07a06617b8 b436695549
commit 4abb3c5ebc
186 changed files with 2609 additions and 21832 deletions
@@ -9,3 +9,4 @@ django-celery==2.2.2
 django-sentry==1.6.0
 django-taggit==0.9.3
 South==0.7.3
+django-mptt==0.4.2
@@ -6,3 +6,4 @@ django-celery==2.2.2
 django-sentry==1.6.0
 django-taggit==0.9.3
 South==0.7.3
+django-mptt==0.4.2