From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Mon, 22 Oct 2012 16:07:01 +0000 (-0500)
Subject: Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=d7d9933735d7a0b4339e1a4e6bebe169ba9f4f9a;p=mediagoblin.git

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

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
---

d7d9933735d7a0b4339e1a4e6bebe169ba9f4f9a