Merge remote branch 'remotes/jwandborg/feature_400-resize_images_to_fit_page'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sat, 16 Jul 2011 21:28:12 +0000 (16:28 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sat, 16 Jul 2011 21:28:12 +0000 (16:28 -0500)
commit5f72a4c3314a6e6c0d05d916f380557fdf744d57
tree1e6958635f398cf29089a082bd62727bcdf11ff1
parent8e9331c1069e5c5bcf1b8d68b59eeff63123fd14
parent380ac094f6ebcf7b457d98a86ac7cc0af2347ba4
Merge remote branch 'remotes/jwandborg/feature_400-resize_images_to_fit_page'

Conflicts:
mediagoblin/db/migrations.py
mediagoblin/db/models.py
mediagoblin/process_media/__init__.py
mediagoblin/templates/mediagoblin/user_pages/media.html
mediagoblin/util.py
mediagoblin/db/models.py
mediagoblin/process_media/__init__.py
mediagoblin/templates/mediagoblin/user_pages/media.html
mediagoblin/util.py