Merge branch 'smart_staging' into master_merge_test

Conflicts: apps/common/__init__.py requirements/development.txt requirements/production.txt
2011-07-21 03:55:21 -04:00
parent 038a0ea041 28ecd22944
commit d202d23862
66 changed files with 2596 additions and 998 deletions
--- a/apps/documents/utils.py
+++ b/apps/documents/utils.py
@@ -1,6 +1,6 @@
 import os

-from common import TEMPORARY_DIRECTORY
+from common.conf.settings import TEMPORARY_DIRECTORY

 try:
    from python_magic import magic