summaryrefslogtreecommitdiff
path: root/CONTRIBUTORS.txt
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-05-25 18:55:34 -0700
committerChris McDonough <chrism@plope.com>2011-05-25 18:55:34 -0700
commit1e729275e1fb993bf32a24dd1d2e6c2b79878291 (patch)
tree91ba4f2d279b68d9f413df035f28fb0ffb9d4443 /CONTRIBUTORS.txt
parent7d34f86e98b6002bccd1e04f205b3387c6a1118d (diff)
parent5c5e301de0927d602d239016e586a320afe6c3fc (diff)
downloadpyramid-1e729275e1fb993bf32a24dd1d2e6c2b79878291.tar.gz
pyramid-1e729275e1fb993bf32a24dd1d2e6c2b79878291.tar.bz2
pyramid-1e729275e1fb993bf32a24dd1d2e6c2b79878291.zip
Merge pull request #194 from mmerickel/session_authn
Session-based authentication policy
Diffstat (limited to 'CONTRIBUTORS.txt')
-rw-r--r--CONTRIBUTORS.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index f2195de70..2873ce1b6 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -138,3 +138,5 @@ Contributors
- Juliusz Gonera, 2011/04/17
- Philip Jenvey, 2011/04/24
+
+- Michael Merickel, 2011/5/25