Merge branch 'django14'

Conflicts:
	templates/releng/result_section.html

1 files changed, 6 insertions, 10 deletions

diff --git a/manage.py b/manage.py
index 317dd156..debb55e5 100755
--- a/manage.py
+++ b/manage.py
@@ -1,16 +1,12 @@
 #!/usr/bin/env python2
+import os
+import sys
 
-from django.core.management import execute_manager
+if __name__ == "__main__":
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings")
 
-try:
-    import settings # Assumed to be in the same directory.
-except ImportError:
-    import sys
-    sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n" % __file__)
-    sys.exit(1)
+    from django.core.management import execute_from_command_line
 
-if __name__ == "__main__":
-    execute_manager(settings)
+    execute_from_command_line(sys.argv)
 
 # vim: set ts=4 sw=4 et:
-