From: Christopher Allan Webber Date: Tue, 9 Aug 2011 03:27:51 +0000 (-0500) Subject: Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=df236d15c18687986786f09f33fedddfb63d5d13;p=mediagoblin.git Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin --- df236d15c18687986786f09f33fedddfb63d5d13