From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Wed, 1 Jun 2011 00:17:28 +0000 (-0500)
Subject: Merge remote branch 'remotes/aleks/aleks'
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=d9951a6e03686e41479b83bc022eb97945efeca9;p=mediagoblin.git

Merge remote branch 'remotes/aleks/aleks'
---

d9951a6e03686e41479b83bc022eb97945efeca9