From: Joar Wandborg <git@wandborg.com>
Date: Mon, 2 Apr 2012 13:09:53 +0000 (+0200)
Subject: Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=0e434913747b3f26d3bc0a6660b53505d4a218c8;p=mediagoblin.git

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

0e434913747b3f26d3bc0a6660b53505d4a218c8