From: jpope777 <jpope@jpope.org>
Date: Wed, 8 Jan 2014 02:40:12 +0000 (-0600)
Subject: Merge remote-tracking branch 'upstream/skeletongobblin' into skeleton
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=b2de5021c6bc12d4970e4db843e4e4b18605318e;p=mediagoblin.git

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

b2de5021c6bc12d4970e4db843e4e4b18605318e