Merge remote branch 'remotes/jwandborg/feature_400-resize_images_to_fit_page'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 3 Jul 2011 00:00:01 +0000 (19:00 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 3 Jul 2011 00:00:01 +0000 (19:00 -0500)
commitd8db3f112e5b666815f0c9af4b9b1d0800fac822
treeb10b7e31288e8f140c28ff0798a4b60a350cf110
parent841110a75d56f3e120691c43f85b3dd4b5fa1e56
parent93214d8e0287150aef3f4370237303bc73ec448c
Merge remote branch 'remotes/jwandborg/feature_400-resize_images_to_fit_page'

Conflicts:
mediagoblin/templates/mediagoblin/user_pages/media.html
mediagoblin/templates/mediagoblin/user_pages/media.html