# HG changeset patch
# User Brian Neal <bgneal@gmail.com>
# Date 1457058161 21600
# Node ID 03237aaad83906d176688dc0a02bb6241bdad08d
# Parent  1a9a03637f779210f2e8a2faa0c3bd4801a1a4da# Parent  37bc59f229672c545e92b7012286f62217756dc2
Merge with upstream.

diff -r 1a9a03637f77 -r 03237aaad839 requirements.txt
--- a/requirements.txt	Thu Mar 03 20:22:16 2016 -0600
+++ b/requirements.txt	Thu Mar 03 20:22:41 2016 -0600
@@ -4,7 +4,7 @@
 bleach==1.4
 boto==2.13.0
 celery==3.1.18
-Django==1.8.8
+Django==1.8.10
 django-haystack==2.4.1
 django-picklefield==0.3.1
 django-tagging==0.4
diff -r 1a9a03637f77 -r 03237aaad839 sg101/templates/base.html
--- a/sg101/templates/base.html	Thu Mar 03 20:22:16 2016 -0600
+++ b/sg101/templates/base.html	Thu Mar 03 20:22:41 2016 -0600
@@ -113,8 +113,6 @@
       <img src="{% static "logos/nesma.png" %}" alt="NESMA" title="N.E.S.M.A."></a></li>
    <li><a href="http://hangninesurfmusic.blogspot.de/">
       <img src="{% static "logos/hangnine.png" %}" alt="HangNine" title="HangNine Blog"></a></li>
-   <li><a href="http://www.surfrockmusic.com">
-      <img src="{% static "logos/surfrock.png" %}" alt="SurfRockMusic.com" title="SurfRockMusic.com"></a></li>
    <li><a href="http://www.northseasurfradio.com">
       <img src="{% static "logos/northsea.png" %}" alt="NSSR" title="North Sea Surf Radio"></a></li>
    <li><a href="http://www.luxuriamusic.com/podcasts/Fiberglass%20Jungle">