try to clarify the docs to avoid "if '__main__'" confusion
update old ptweens output
Add HTML escaping to views.py

At least it's less obviously dangerous this way.
Merge pull request #1168 from jthemphill/patch-1

Add HTML escaping to views.py in the wiki2 tutorial
Merge branch 'master' of github.com:Pylons/pyramid
Merge branch '1.5-branch' of github.com:Pylons/pyramid into 1.5-branch
Merge branch 'master' into 1.5-branch
Merge branch 'master' of github.com:Pylons/pyramid
use a single serializer instead of serialize/deserialize in session.py, use SignedSerializer from (yet to be released) webob 1.3 instead of local logic in session.py
use CookieProfile from webob in authentication module, add support for new domain attribute on dummy request, depend on webob 1.3 or better
Fix JSONP syntax error
add note about non-bw-compat between SignedCookieSessionFactory and UnencryptedCookieSessionFactory.  Ref #1200.
prep for 1.5a3
Use new pluralize calling convention recognised by Lingua 1.7
Expand on docstring
Fix a typo.
Merge pull request #1208 from whiteroses/master

Fix a typo.
Merge pull request #1206 from MatthewWilkes/master

Update pluralize docs now lingua1.7 is out
Merge branch 'master' of github.com:Pylons/pyramid
Merge branch 'jsonp-syntax' of github.com:wichert/pyramid into wichert-jsonp-syntax