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

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

bb770e295cd727429df524b0a5c3952ea449fdb2