From: jpope <jpope@jpope.org>
Date: Sun, 5 Jan 2014 22:55:58 +0000 (-0600)
Subject: Merge remote-tracking branch 'upstream/master' into skeletongobblin
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=0172ad000148f1cfe6f5110982c364f46b3d0ecb;p=mediagoblin.git

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

0172ad000148f1cfe6f5110982c364f46b3d0ecb