From: Brett Smith <brettcsmith@brettcsmith.org>
Date: Sun, 8 Jul 2012 15:07:02 +0000 (-0400)
Subject: Merge branch 'master' into 201207-testfixes
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=81d3c4cf1cee923c4b803a96b6f5628e9aa9b78d;p=mediagoblin.git

Merge branch 'master' into 201207-testfixes
---

81d3c4cf1cee923c4b803a96b6f5628e9aa9b78d