generate more common filenames for sqlite
generate more common filenames for sqlite and patch the wiki2
tutorial, too
Merge branch 'master' of github.com:muellert/pyramid
flesh out system values
Merge branch '1.3-branch'
- Add ``REMOTE_ADDR`` to the ``prequest`` WSGI environ dict for benefit of
  the debug toolbar, which effectively requires it to be present to work
  properly.
Merge branch '1.3-branch'
fix tests under py33
speculative fix for issue #512
Mark line with yellow in SQL wiki - issue #510
add a test for an asset spec with a module dir
use a dollar sign instead of an under
add change note
Merge branch 'fix.512'
signed contributors agreement
Merge pull request #515 from stevepiercy/contributors

signed contributors agreement
intermediate commit
JSON-API rework and Object.__json__ support
signed contributors agreement
- Coverage and docs updates for custom JSON class.

- Fork point: master now represents a future 1.4 release.