From: Joar Wandborg <git@wandborg.com>
Date: Thu, 29 Mar 2012 21:01:40 +0000 (+0200)
Subject: Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=450ea6094d516454429dd27cd07b3799a895f78e;p=mediagoblin.git

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

450ea6094d516454429dd27cd07b3799a895f78e