Merge remote branch 'remotes/gullydwarf-cfdv/b388+b391_edit_profile_link_on_user_page'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 3 Jul 2011 13:31:35 +0000 (08:31 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 3 Jul 2011 13:31:35 +0000 (08:31 -0500)
commit8c9b1b2c14f68e559efb6f655e5d6ce082342f16
treef19b0df06667d15afbad7936add61f56a71ef319
parent5949be9ad686b161b6c63696d9b0f5f1cff932d9
parenta0cf14fe7cbfe013a9973ad72a7bbd662656c9c9
Merge remote branch 'remotes/gullydwarf-cfdv/b388+b391_edit_profile_link_on_user_page'
mediagoblin/templates/mediagoblin/user_pages/media.html
mediagoblin/templates/mediagoblin/user_pages/user.html