don't send error emails if the url parameter has unicode
Merge branch 'master' of http://github.com/ecprice/newsdiffs
Merge branch 'master' of http://github.com/ecprice/newsdiffs
Merge branch 'master' of http://github.com/ecprice/newsdiffs
Merge branch 'master' of http://github.com/ecprice/newsdiffs
Merge branch 'master' of http://github.com/ecprice/newsdiffs
Merge branch 'master' of http://github.com/ecprice/newsdiffs
Merge branch 'master' of http://github.com/ecprice/newsdiffs
Merge branch 'master' of http://github.com/ecprice/newsdiffs
ignore urls longer than 255 characters rather than crash
Merge branch 'master' of http://github.com/ecprice/newsdiffs
Merge branch 'master' of http://github.com/ecprice/newsdiffs
Merge branch 'master' of http://github.com/ecprice/newsdiffs
robustness to refs/heads/master.lock remaining after crash
Increment caching period to 60m
Enable caching on development settings
Merge remote-tracking branch 'upstream/master'