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

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

03abcd0841c1ddfdcb7b81c6fa40f308edbf0568