From: Joar Wandborg Date: Thu, 29 Mar 2012 14:19:11 +0000 (+0200) Subject: Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=90b25eb2d1563ca945c18151738196d5305568fb;p=mediagoblin.git Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin --- 90b25eb2d1563ca945c18151738196d5305568fb