From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Mon, 26 Mar 2012 19:33:12 +0000 (-0500)
Subject: Merge remote-tracking branch 'remotes/bretts/bug261-resized-filenames'
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=e3e5980624d70922b84df764d32625d088fb841c;p=mediagoblin.git

Merge remote-tracking branch 'remotes/bretts/bug261-resized-filenames'
---

e3e5980624d70922b84df764d32625d088fb841c