parent: eb403f | patch | commitdiff
Michael Merickel
2012-08-23 b8b896b748ba5d4fd9c6d46db0d6f192cab264f3
refs
author Michael Merickel <michael@merickel.org>
Thursday, August 23, 2012 17:18 +0200
committer Michael Merickel <michael@merickel.org>
Thursday, August 23, 2012 17:18 +0200
commitb8b896b748ba5d4fd9c6d46db0d6f192cab264f3
tree 58bd219db2e546ed1ed882cd5649eda77561412f tree | zip | gz
parent eb403ffe22501ae0546c02c7c24b54b5e3d1eb83 view | diff
2cc0710ecf9b47e5a6f41caf6b1c56b29bab2db0 view | diff 
Merge branch 'master' of ianjosephwilson/pyramid into pull.617

Conflicts:
	CONTRIBUTORS.txt
3 files modified
150 ■■■■■ changed files
CONTRIBUTORS.txt 2 ●●●●● diff | view | raw | blame | history
pyramid/session.py 106 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_session.py 42 ●●●●● diff | view | raw | blame | history