From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Fri, 17 May 2013 16:13:17 +0000 (-0500)
Subject: Merge remote-tracking branch 'refs/remotes/elrond/misc/pytest_enable_testing'
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=b69dd853049fd7560542b47bac73675b33c78364;p=mediagoblin.git

Merge remote-tracking branch 'refs/remotes/elrond/misc/pytest_enable_testing'
---

b69dd853049fd7560542b47bac73675b33c78364