summaryrefslogtreecommitdiff
path: root/CONTRIBUTORS.txt
diff options
context:
space:
mode:
authorBlaise Laflamme <blaise@laflamme.org>2011-11-26 18:31:22 -0500
committerBlaise Laflamme <blaise@laflamme.org>2011-11-26 18:31:22 -0500
commit7613a6441f273ccc5642e20b2ce5788d01291466 (patch)
tree8de6ce23bf54325b8524c50336020cb509ce1b16 /CONTRIBUTORS.txt
parent11129ca073b4926037368d9a0bf079dc422e28f7 (diff)
parent50e89abccc9c23949fb7cdd928a865712c34aa75 (diff)
downloadpyramid-7613a6441f273ccc5642e20b2ce5788d01291466.tar.gz
pyramid-7613a6441f273ccc5642e20b2ce5788d01291466.tar.bz2
pyramid-7613a6441f273ccc5642e20b2ce5788d01291466.zip
Merge branch 'master' of github.com:Pylons/pyramid
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