Merge remote-tracking branch 'remotes/bretts/bug261-resized-filenames'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Mon, 26 Mar 2012 19:33:12 +0000 (14:33 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Mon, 26 Mar 2012 19:33:12 +0000 (14:33 -0500)
commite3e5980624d70922b84df764d32625d088fb841c
tree480e5d7c994f31797be4990bc0347d6b866bc5b2
parentebb24e4fd18fb53133755333314a23d22fc72707
parentc16b8196631e5b1c4cbe618a9af74f5455fe861c
Merge remote-tracking branch 'remotes/bretts/bug261-resized-filenames'