Christopher Allan Webber 86d01f0816 Merge branch 'stable'
Conflicts:
	mediagoblin/i18n/templates/en/mediagoblin.po
	mediagoblin/plugins/archivalook/tools.py
2015-12-19 21:57:27 -06:00
..
2015-12-19 21:57:27 -06:00