summaryrefslogtreecommitdiff
path: root/CONTRIBUTORS.txt
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2013-09-30 20:42:09 -0700
committerMichael Merickel <michael@merickel.org>2013-09-30 20:42:09 -0700
commita84105fa594911121ba2bcba8a9435c8705c7c4d (patch)
treef7650b9768863b3b6f3c95193bd991f0fa3b5bd7 /CONTRIBUTORS.txt
parentebca905c2a2e1e796f3840baaf154a6d9d695cc4 (diff)
parent84ae800468544650c4a2eaa01a3ac805dafba480 (diff)
downloadpyramid-a84105fa594911121ba2bcba8a9435c8705c7c4d.tar.gz
pyramid-a84105fa594911121ba2bcba8a9435c8705c7c4d.tar.bz2
pyramid-a84105fa594911121ba2bcba8a9435c8705c7c4d.zip
Merge pull request #1135 from kpinc/contributors
Contributors
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 1a5b975d7..bfe22e540 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -222,3 +222,5 @@ Contributors
- Takahiro Fujiwara, 2013/08/28
- Doug Hellmann, 2013/09/06
+
+- Karl O. Pinc, 2013/09/27