Merge branch 'master' of github.com:Pylons/pyramid
move docs section to a more appropriate place
Merge branch 'master' of github.com:Pylons/pyramid
update render() to preserve the original response object
remove the deprecated request.response_* attributes
update HACKING
Merge branch 'fix.remove-deprecated-request-attrs'
resolve conflicts, reword change entry a bit
Merge branch 'master' into feature/split_chameleon_from_pyramid

Conflicts:
	pyramid/tests/test_renderers.py