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

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

3efb0848096e00b1d7a82a62b717289efafc95fa