From: Jef van Schendel <jefvanschendel@gmail.com>
Date: Mon, 20 Jun 2011 14:33:14 +0000 (+0200)
Subject: Merge remote-tracking branch 'gitorious/master'
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=2d1f91cc41aca908502ea1d18687b902a5fd90a1;p=mediagoblin.git

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

2d1f91cc41aca908502ea1d18687b902a5fd90a1