From: Jef van Schendel <jefvanschendel@gmail.com>
Date: Tue, 21 Jun 2011 09:22:31 +0000 (+0200)
Subject: Merge remote-tracking branch 'gitorious/master'
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=4e5a55787ba16c06944ab63afa3642070b2a7b14;p=mediagoblin.git

Merge remote-tracking branch 'gitorious/master'
---

4e5a55787ba16c06944ab63afa3642070b2a7b14