[SCM] live-studio branch, master, updated. 0260d302c6dce15cee9872c218a72a23fe06160e

[Chris Lamb]

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

    Use a slighly saner From: header

diff --git a/live_studio/settings/defaults/misc.py b/live_studio/settings/defaults/misc.py
index a4ae386..06d5b19 100644
--- a/live_studio/settings/defaults/misc.py
+++ b/live_studio/settings/defaults/misc.py
@@ -57,3 +57,5 @@ LOGIN_REDIRECT_URL = '/configs'
 ACCOUNT_ACTIVATION_DAYS = 7
 
 INTERNAL_IPS = ('127.0.0.1',)
+
+DEFAULT_FROM_EMAIL = 'noreply at studio.debian.net'

-- 
live-studio