summaryrefslogtreecommitdiff
path: root/CONTRIBUTORS.txt
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-11-18 05:48:57 -0500
committerChris McDonough <chrism@plope.com>2011-11-18 05:48:57 -0500
commit69cc84c19acdff6e12b2e166248bb35293ed2e5a (patch)
tree0cc7b1c9905c9d903986c06c32e5df127dacef3a /CONTRIBUTORS.txt
parent4f47e7cd2fea3f656fd17e6180c6ee30c0753bd2 (diff)
parent0e5441806857e3c1ef59d1b2075d6e4238587804 (diff)
downloadpyramid-69cc84c19acdff6e12b2e166248bb35293ed2e5a.tar.gz
pyramid-69cc84c19acdff6e12b2e166248bb35293ed2e5a.tar.bz2
pyramid-69cc84c19acdff6e12b2e166248bb35293ed2e5a.zip
Merge branch 'kdienes-master'
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 2654801c3..a449333cb 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -156,3 +156,5 @@ Contributors
- Ken Manheimer, 2011/11/07
- Reed O'Brien, 2011/11/07
+
+- Klee Dienes, 2011/10/30