Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
authorChristopher Allan Webber <cwebber@dustycloud.org>
Fri, 18 Nov 2011 15:34:09 +0000 (09:34 -0600)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Fri, 18 Nov 2011 15:34:09 +0000 (09:34 -0600)
commit817066506d846d06d0489dfb42b8200b86f61153
tree36578ed7e5b2b205c919fcfb8929c8fc33a79c3f
parent76c6c806caec7af20a3fe11c04bb783baacc3934
parent3618a9ac5112c657fd095a0f9cbd346921a4e800
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin

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