[SCM] live-studio branch, master, updated. 52eb20a191ee4ec9f567f3b24bb020effec8d7c0

[Chris Lamb]

The following commit has been merged in the master branch:
commit ea41401e714ef2b463d2633ca9c3fd2bce14bc92
Author: Chris Lamb <lamby at debian.org>
Date:   Fri Jul 30 17:32:18 2010 -0400

    Use alias instead of root as it's less weird.

diff --git a/config/live-studio-nginx b/config/live-studio-nginx
index ca6048d..dcaa6f3 100644
--- a/config/live-studio-nginx
+++ b/config/live-studio-nginx
@@ -8,7 +8,7 @@ server {
 	}
 
 	location /admin/media {
-		root /usr/share/pyshared/django/contrib;
+		alias /usr/share/pyshared/django/contrib/admin/media;
 	}
 
 	location /builds {

-- 
live-studio