From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Fri, 19 Sep 2014 21:25:35 +0000 (-0500)
Subject: Merge remote-tracking branch 'refs/remotes/moggers87/garbage-branch'
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=1f7f2891ea1ae8de9ed7e9f4d27f693b524e326e;p=mediagoblin.git

Merge remote-tracking branch 'refs/remotes/moggers87/garbage-branch'
---

1f7f2891ea1ae8de9ed7e9f4d27f693b524e326e