Merge commit '822898e' (Merge branch 'django14')

Conflicts:
	requirements.txt
	requirements_prod.txt
	templates/base.html
	templates/devel/clock.html
	templates/public/download.html
	templates/public/index.html
	templates/releng/results.html

1 files changed, 1 insertions, 1 deletions

diff --git a/urls.py b/urls.py
index 482564bd..d7b3be9b 100644
--- a/urls.py
+++ b/urls.py
@@ -1,7 +1,7 @@
 import os.path
 
 # Stupid Django. Don't remove these "unused" handler imports
-from django.conf.urls.defaults import handler500, handler404, include, patterns
+from django.conf.urls import handler500, handler404, include, patterns
 from django.conf import settings
 from django.contrib import admin