From: jpope777 <jpope@jpope.org>
Date: Tue, 7 Jan 2014 00:21:29 +0000 (-0600)
Subject: Merge remote-tracking branch 'upstream/skeletongobblin' into skeleton
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=1b6831193f29f18094563d35721059bc5b6dd760;p=mediagoblin.git

Merge remote-tracking branch 'upstream/skeletongobblin' into skeleton
---

1b6831193f29f18094563d35721059bc5b6dd760