X-Git-Url: https://git.openstreetmap.org/osqa.git/blobdiff_plain/2444d6ffd7995be782615589fb1d5aef2c8277ce..3223ab3b10da1eac0f6f608a2619ffe53d5a0889:/urls.py

diff --git a/urls.py b/urls.py
index 0355657..e56bc01 100644
--- a/urls.py
+++ b/urls.py
@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import patterns, url, include
 from django.utils.translation import ugettext as _
 from django.conf import settings
 
@@ -7,7 +7,9 @@ urlpatterns = patterns('',
 )
 
 if 'rosetta' in settings.INSTALLED_APPS:
-    urlpatterns += patterns('',
+    urlpatterns = patterns('',
         url(r'^rosetta/', include('rosetta.urls')),
-    )
+    ) + urlpatterns
 
+handler404 = 'forum.views.meta.page'
+handler500 = 'forum.views.meta.error_handler'