Christopher Allan Webber 5f72a4c331 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

2011-07-16 16:28:12 -05:00

..

__init__.py

Merge remote branch 'remotes/jwandborg/feature_400-resize_images_to_fit_page'

2011-07-16 16:28:12 -05:00