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

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

852c7fdb8a8966fac1fff52501a2d65b8354e070