Merge branch 'master' of git://projects.archlinux.org/archweb

Conflicts:
	devel/views.py
	feeds.py
	templates/devel/index.html
	templates/packages/flag.html
	templates/public/index.html
	todolists/views.py
	urls.py

1 files changed, 5 insertions, 4 deletions

diff --git a/devel/urls.py b/devel/urls.py
index 41be2b31..9bf50f45 100644
--- a/devel/urls.py
+++ b/devel/urls.py
@@ -1,12 +1,13 @@
 from django.conf.urls.defaults import patterns
 
 urlpatterns = patterns('devel.views',
-    (r'^$',          'index'),
+    (r'^admin_log/$','admin_log'),
+    (r'^admin_log/(?P<username>.*)/$','admin_log'),
     (r'^clock/$',    'clock'),
-    (r'^profile/$',  'change_profile'),
+    (r'^$',          'index'),
     (r'^newuser/$',  'new_user_form'),
-    (r'^admin_log/(?P<username>.*)/$','admin_log'),
-    (r'^admin_log/$','admin_log'),
+    (r'^profile/$',  'change_profile'),
+    (r'^reports/(?P<report>.*)/$', 'report'),
 )
 
 # vim: set ts=4 sw=4 et: