From: Christopher Allan Webber Date: Sun, 4 Dec 2011 17:06:08 +0000 (-0600) Subject: Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=f79886023fb3d8fb55214e19131740159992aa34;p=mediagoblin.git Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin --- f79886023fb3d8fb55214e19131740159992aa34