From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Sun, 24 Feb 2013 19:52:13 +0000 (-0600)
Subject: Merge remote-tracking branch 'refs/remotes/pythonsnake/581_config'
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=203f51a8662f681eb0edc71d75e930d778b51df5;p=mediagoblin.git

Merge remote-tracking branch 'refs/remotes/pythonsnake/581_config'
---

203f51a8662f681eb0edc71d75e930d778b51df5