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

1 files changed, 3 insertions, 1 deletions

diff --git a/urls.py b/urls.py
index bcbc78dc..a2c86d57 100644
--- a/urls.py
+++ b/urls.py
@@ -1,3 +1,5 @@
+import os.path
+
 from django.conf.urls.defaults import *
 from django.conf import settings
 from django.contrib import admin
@@ -97,6 +99,6 @@ urlpatterns += patterns('',
 if settings.DEBUG == True:
     urlpatterns += patterns('',
         (r'^media/(.*)$', 'django.views.static.serve', 
-            {'document_root': settings.DEPLOY_PATH+'/media'}))
+            {'document_root': os.path.join(settings.DEPLOY_PATH, 'media')}))
 
 # vim: set ts=4 sw=4 et: