From: Christopher Allan Webber Date: Thu, 17 Jan 2013 21:51:30 +0000 (-0600) Subject: Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=00cf28da215e73c494f553e7de3d21a9b63cf0cf;p=mediagoblin.git Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin --- 00cf28da215e73c494f553e7de3d21a9b63cf0cf