From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Wed, 10 Aug 2011 15:51:44 +0000 (-0500)
Subject: Merge branch 'mergeme'
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=c22d624af3cc473d3b31baaf6f1a32a498a949e0;p=mediagoblin.git

Merge branch 'mergeme'
---

c22d624af3cc473d3b31baaf6f1a32a498a949e0