From: Joar Wandborg <git@wandborg.com>
Date: Tue, 3 May 2011 18:04:55 +0000 (+0200)
Subject: Merge branch 'master' of http://git.gitorious.org/mediagoblin/mediagoblin
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=1b46208f3e6daa773ed0ac2b7c811db68b8b3123;p=mediagoblin.git

Merge branch 'master' of git.gitorious.org/mediagoblin/mediagoblin
---

1b46208f3e6daa773ed0ac2b7c811db68b8b3123