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

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

ab6cb466172fc3c8f960953b4a4d2724a6610041