From: Christopher Allan Webber Date: Fri, 29 Mar 2013 13:09:36 +0000 (-0500) Subject: Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=047d8d5871ee8ee97ea52a78512fe5b2da51b8cc;p=mediagoblin.git Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin --- 047d8d5871ee8ee97ea52a78512fe5b2da51b8cc