Merge branch 'master' of github.com:Pylons/pyramid
Merge branch 'master' of github.com:ztane/pyramid into ztane-master
80 chars
Merge branch 'ztane-master'
Removed extra indentation from some examples (:linenos: should be indented with the same indentation as the rest of the code block)