From: xray7224 <xray7224@googlemail.com>
Date: Sun, 14 Jul 2013 16:31:03 +0000 (+0100)
Subject: Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=670717d950c4bb5ef908c23e46df4016b5dc2bd2;p=mediagoblin.git

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

670717d950c4bb5ef908c23e46df4016b5dc2bd2