Merge branch 'stable'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 20 Dec 2015 03:57:27 +0000 (21:57 -0600)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 20 Dec 2015 03:57:27 +0000 (21:57 -0600)
commit86d01f0816d3ccfb481a0e4218aa68d8e780c4f1
tree7f67ae6862f2b21f9d9c661e6670867c8c028f94
parentf1db51e4db689a7f68973ce466b01918af1f4e37
parent6e38fec80ebaadc3b3cfdc912f40cc4e8bb9b31c
Merge branch 'stable'

Conflicts:
mediagoblin/i18n/templates/en/mediagoblin.po
mediagoblin/plugins/archivalook/tools.py
mediagoblin/i18n/templates/en/mediagoblin.po