Merge remote branch 'remotes/gullydwarf-cfdv/is330'

Conflicts:
	mediagoblin/templates/mediagoblin/user_pages/gallery.html

diff --cc mediagoblin/templates/mediagoblin/user_pages/gallery.html
index 33732d0d8d66cddc8015ce64005253bd0a2648f4,6f68a41f8a323c3efb113d35a8fe451edf810743..28290cfda88f86f44b35a9fbea230dad58c3207e
--- 1/mediagoblin/templates/mediagoblin/user_pages/gallery.html
--- 2/mediagoblin/templates/mediagoblin/user_pages/gallery.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/gallery.html
@@@ -20,15 -20,16 +20,16 @@@
  {% block mediagoblin_head %}
      <link rel="alternate" type="application/atom+xml"
            href="{{ request.urlgen(
--                     'mediagoblin.user_pages.atom_feed',
++                       'mediagoblin.user_pages.atom_feed',
                         user=user.username) }}">
  {% endblock mediagoblin_head %}
  
  {% block mediagoblin_content -%}
    {% if user %}
-     <h1><a href="{{ request.urlgen(
-                                   'mediagoblin.user_pages.user_home',
-                                  user=user.username) }}">{{ user.username }}</a>'s media</h1>
 -    <h1>gallery for 
 -        <a href="{{ request.urlgen(
 -                     'mediagoblin.user_pages.user_home',
 -                       user=user.username) }}">{{ user.username }}</a></h1>
++    <h1>
++      <a href="{{ request.urlgen(
++                      'mediagoblin.user_pages.user_home',
++                      user=user.username) }}">{{ user.username }}</a>'s media</h1>
  
      {% include "mediagoblin/utils/object_gallery.html" %}