typo
typo
Merge branch 'master' of github.com:Pylons/pyramid
make sure that missing template renderer factories dont cause a startup time error, and instead behave like other renderers which, when missing, cause pyramid to throw a valueerror at rendering time
better description of mako/chameleon bw incompat in changelog, update whatsnew for 1.5
Merge branch 'master' into 1.5-branch
run zodb scaffolding tests on py3 too (now compat) and dont use distribute ever
Merge branch 'master' into 1.5-branch
prep for 1.5a2
Merge branch 'master' into 1.5-branch