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

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

a42c871161cfa3e2247b9e38e24ce77b2cd8ced8