From: Christopher Allan Webber Date: Sun, 24 Jul 2011 19:56:39 +0000 (-0500) Subject: Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=73da11e759913109e481c2b20c51c9f72e45be14;p=mediagoblin.git Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin --- 73da11e759913109e481c2b20c51c9f72e45be14