Merge branch 'master' of github.com:Pylons/pyramid
Merge branch 'master' of github.com:Pylons/pyramid
Merge branch 'master' of github.com:Pylons/pyramid
Merge branch 'master' of github.com:Pylons/pyramid
Move coverage floor pct into 'setup.cfg'.
Add documentation on handling CORS pre-flights
Merge branch 'master' of github.com:Pylons/pyramid
Merge branch 'master' of https://github.com/AdrianTeng/pyramid into AdrianTeng-master
repoze who docs moved
79 cols
Merge branch 'AdrianTeng-master'
Speed up Travis start via 'sudo: false'.
Merge pull request #1479 from stevepiercy/master

replace router.png with pyramid_router.svg and make design consistent