From: Christopher Allan Webber Date: Sat, 2 Jul 2011 22:46:26 +0000 (-0500) Subject: Merge remote branch 'remotes/gullydwarf-cfdv/b404_edit_profile_navfix' X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=316855fa4470386927612828ca206e4794cc4d73;p=mediagoblin.git Merge remote branch 'remotes/gullydwarf-cfdv/b404_edit_profile_navfix' --- 316855fa4470386927612828ca206e4794cc4d73