# HG changeset patch
# User Brian Neal <bgneal@gmail.com>
# Date 1441245044 18000
# Node ID 734a4a350bd5ce067ced01b15e2b40a250f76147
# Parent  51a2051588f5f7e31e5bb6bb9a25a3f12e985381# Parent  2aaf9fa5867bb4512e92ce2fa7e78d57bfe39249
Merge with upstream.

diff -r 51a2051588f5 -r 734a4a350bd5 requirements.txt
--- a/requirements.txt	Wed Sep 02 20:50:08 2015 -0500
+++ b/requirements.txt	Wed Sep 02 20:50:44 2015 -0500
@@ -1,4 +1,4 @@
-Django==1.7.9
+Django==1.7.10
 Markdown==2.5.1
 MySQL-python==1.2.4
 -e git+https://github.com/gremmie/django-elsewhere.git@1203bd331aba4c5d4e702cc4e64d807310f2b591#egg=django_elsewhere-master
diff -r 51a2051588f5 -r 734a4a350bd5 requirements_dev.txt
--- a/requirements_dev.txt	Wed Sep 02 20:50:08 2015 -0500
+++ b/requirements_dev.txt	Wed Sep 02 20:50:44 2015 -0500
@@ -1,4 +1,4 @@
-Django==1.7.9
+Django==1.7.10
 Markdown==2.5.1
 MySQL-python==1.2.5
 django-debug-toolbar==1.3.0
diff -r 51a2051588f5 -r 734a4a350bd5 requirements_mac.txt
--- a/requirements_mac.txt	Wed Sep 02 20:50:08 2015 -0500
+++ b/requirements_mac.txt	Wed Sep 02 20:50:44 2015 -0500
@@ -1,4 +1,4 @@
-Django==1.7.9
+Django==1.7.10
 Markdown==2.5.1
 MySQL-python==1.2.5
 django-debug-toolbar==1.0
diff -r 51a2051588f5 -r 734a4a350bd5 sg101/templates/base.html
--- a/sg101/templates/base.html	Wed Sep 02 20:50:08 2015 -0500
+++ b/sg101/templates/base.html	Wed Sep 02 20:50:44 2015 -0500
@@ -92,9 +92,9 @@
 
 <div id="content-primary" class="span-19 last">
    <div>
-      <a href="/forums/topic/26502/">
-         <img src="{{ STATIC_URL }}images/NSSRTopAlbum101.png" alt="NSSR Top 101 Surf Albums"
-            title="Vote for the Surf Album Top 101 on North Sea Surf Radio"/></a>
+      <a href="/forums/topic/26666/">
+         <img src="{{ STATIC_URL }}images/NSSRTopAlbum101-2015.png" alt="NSSR Top 101 Surf Albums"
+            title="Listen to the Surf Album Top 101 on North Sea Surf Radio"/></a>
    </div>
    {% block content %}
    {% endblock %}
diff -r 51a2051588f5 -r 734a4a350bd5 static/images/NSSRTopAlbum101-2015.png
Binary file static/images/NSSRTopAlbum101-2015.png has changed