From: Jef van Schendel <mail@jefvanschendel.nl>
Date: Mon, 5 Mar 2012 23:36:15 +0000 (+0100)
Subject: Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=3d541b04a9c5fe5729ce1b4386a2964b2730484d;p=mediagoblin.git

Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
---

3d541b04a9c5fe5729ce1b4386a2964b2730484d