From: Jef van Schendel Date: Sun, 21 Oct 2012 00:17:57 +0000 (+0200) Subject: Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=d329882503950eb0b758a6b58b0fa3e6c1eb96e3;p=mediagoblin.git Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin --- d329882503950eb0b758a6b58b0fa3e6c1eb96e3