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

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

2165d464a4aed262deeb7b8b0a3fc283c7adc326