prep for 1.4a1
change to kick rtd
change to kick rtd
no longer in progress
resolve contributors.txt merge conflict
Merge branch 'oddshocks-pretty-css'
Merge branch 'oddshocks-pretty-css' into 1.4-branch
mention set_request_property's doc-deprecation up above as well, make
add_request_method more prominent
add check_csrf convenience function
Merge branch 'master' of github.com:Pylons/pyramid
Merge branch 'master' into 1.4-branch
garden
A ``check_csrf`` view predicate was added.  For example, you can now do
``config.add_view(someview, check_csrf=True)``.  When the predicate is
checked, if the ``csrf_token`` value in ``request.params`` matches the csrf
token in the request's session, the view will be permitted to execute.
Otherwise, it will not be permitted to execute.
Merge branch 'master' into 1.4-branch
garden
remove dead code
Merge branch 'master' into 1.4-branch
note potential 1.5 removals and remove dead code
Filenames like app:foo-bar.mako should be valid.
Merge branch 'sontek-allow-hyphens'