prep for 1.3b2
point at sqla bug
Merge branch 'master' into 1.3-branch
Merge branch 'master' of github.com:Pylons/pyramid
wrong class name, fixes #451
Merge pull request #453 from mjpieters/master
Fixes #452: remove mention of the `root_factory` argument from the startup narrative.
Remove mention of the `root_factory` argument.
The example code earlier on the page does not use the `root_factory` argument, only the `settings` argument. This is a fix for pyramid issue #452.
fix pserve tests under windows on python 2.6
fix pserve tests on windows 2.6
Merge branch '1.3-branch'
Merge branch 'fix.win32'
only do replacement on windows
fix static_url generation for abspaths on windows
try fixing this on windows
prevent highorder tests from running on non-Linux platforms (these se…
…em to have issues)
close file before trying to reopen it on windows, preventing a test f…
put close inside finally
avoid coping with linefeeds on windows
remove unused file shadowed by a package
Fix security bug caused by __iter__ checking on strings under Python 3
fix on windows
fix windows test failure (trouble deleting open file)
uncomment a test
replace the right thing
hail mary windows
fix for windows