Merge branch 'master' of github.com:Pylons/pyramid
Update hooks.rst

'self' param was omitted in the constructor of simple_tween_factory class
Merge pull request #1341 from bertjwregeer/fix.typo

Update hooks.rst
Docs: narr/templates.rst: Doc default extensions of each template system.
Merge pull request #1345 from kpinc/doc_templates

Docs: narr/templates.rst: Doc default extensions of each template system...
fix typo
Merge pull request #1347 from krysros/master

fix typo
Docs: narr/templates.rst: Link template bindings to pyramid docs.
Merge pull request #1346 from kpinc/doc_templates

Docs: narr/templates.rst: Link template bindings to pyramid docs.
Don't incorrectly default charset on FileResponse

By passing the content_type into the constructor to Response, we can allow it to decide intelligently whether the default charset should apply.  Otherwise we'd have to replicate that logic somehow, or live with weird charset annotations on images, pdfs, and zips.
Add tests for the content_type fix.
Expand tests - make sure pdf, jpeg types also are not annotated with a charset.
close resources and 80-char line width
Merge branch 'pull.1251'
update changelog
Draw attention that tweens instances are unique and shared between threads

Forgetting that tween instance are not instantiated for each request leads to threads issues difficult to detect
clarify tween thread-safety
Merge branch 'pull.1349'
oops, re-clarify that tweens should not have mutable state
fix project url