From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Sat, 30 Apr 2011 13:27:15 +0000 (-0500)
Subject: Merge branch 'master' into celerysubmit
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=776331fd96b55dba004e8bb5a10e02a555bf76c1;p=mediagoblin.git

Merge branch 'master' into celerysubmit
---

776331fd96b55dba004e8bb5a10e02a555bf76c1