From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Sat, 28 Sep 2013 18:32:11 +0000 (-0500)
Subject: Merge remote-tracking branch 'spaetz/master'
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=16ef14ba41f581ed950ae319f363e90540b2cbd7;p=mediagoblin.git

Merge remote-tracking branch 'spaetz/master'
---

16ef14ba41f581ed950ae319f363e90540b2cbd7