# HG changeset patch
# User Bryan O'Sullivan <bos@serpentine.com>
# Date 1238515125 25200
# Node ID 0e33dd5d8288897a186f57f8c832f58d153bfaea
# Parent  88b611f3764654802ab8a3ecb609d281946a4de9# Parent  1735c9699f92a354e7f46a121a656ef489c61662
Automated merge with ssh://ssh.serpentine.com/hg/share/mercurial/book

diff -r 88b611f37646 -r 0e33dd5d8288 web/hgbook/urls.py
--- a/web/hgbook/urls.py	Fri Mar 27 11:09:37 2009 -0700
+++ b/web/hgbook/urls.py	Tue Mar 31 08:58:45 2009 -0700
@@ -1,6 +1,9 @@
 import os
 from django.conf.urls.defaults import *
 import hgbook.comments.feeds as feeds
+from django.contrib import admin
+
+admin.autodiscover()
 
 feeds = {
     'comments': feeds.Comments,
@@ -18,5 +21,5 @@
     #    sys.modules[__name__].__file__) + '/../../en/html'),
 
     # Uncomment this for admin:
-    (r'^admin/', include('django.contrib.admin.urls')),
+    (r'^admin/(.*)', admin.site.root),
 )