# HG changeset patch
# User Brian Neal <bgneal@gmail.com>
# Date 1320112049 18000
# Node ID 7fce0720f89bc01a75739baf9161196cf26eb844
# Parent  ef4155f8c2345dc763f087321253435859926144# Parent  abe08d74dab3d7b0f0558da6b699e5868bc295de
Merging latest code with mine.

diff -r ef4155f8c234 -r 7fce0720f89b bns_website/bands/admin.py
--- a/bns_website/bands/admin.py	Mon Oct 31 20:46:03 2011 -0500
+++ b/bns_website/bands/admin.py	Mon Oct 31 20:47:29 2011 -0500
@@ -4,7 +4,6 @@
 """
 from django.contrib import admin
 from bands.models import Band
-from news.models import News
 
 
 class BandAdmin(admin.ModelAdmin):
@@ -12,4 +11,3 @@
     list_editable = ['order']
 
 admin.site.register(Band, BandAdmin)
-admin.site.register(News)
diff -r ef4155f8c234 -r 7fce0720f89b bns_website/news/admin.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bns_website/news/admin.py	Mon Oct 31 20:47:29 2011 -0500
@@ -0,0 +1,8 @@
+"""
+Automatic admin definitions for the models in the bands application.
+
+"""
+from django.contrib import admin
+from news.models import News
+
+admin.site.register(News)