[SCM] live-studio branch, master, updated. 1fe032df7aaa4bff181daf386b8b4bd02929a28c

[Chris Lamb]

The following commit has been merged in the master branch:
commit 55de1aad6a113d56141ef1f3c89f0e92708577f7
Author: Chris Lamb <lamby at debian.org>
Date:   Sun Aug 1 14:24:22 2010 -0400

    Remove trademark notice.

diff --git a/templates/base.html b/templates/base.html
index 09f6950..31298f1 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -62,8 +62,6 @@
 
     <p>
       Copyright &copy; 2010 <a href="http://chris-lamb.co.uk/">Chris Lamb</a>. Released under the terms of the <a href="http://www.gnu.org/licenses/agpl-3.0.html">GNU Affero General Public License></a> version 3 or greater.
-      <br>
-      Debian is a registered <a href="http://www.debian.org/trademark">trademark</a> of Software in the Public Interest, Inc.
     </p>
   </div>
   </div>

-- 
live-studio