From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Tue, 1 Nov 2011 04:42:12 +0000 (-0500)
Subject: Merge remote branch 'remotes/j1mc/master'
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=345b07ae13e95fb9a52a25bf8d605f82c6dc66da;p=mediagoblin.git

Merge remote branch 'remotes/j1mc/master'
---

345b07ae13e95fb9a52a25bf8d605f82c6dc66da