summaryrefslogtreecommitdiff
path: root/CONTRIBUTORS.txt
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-06-17 10:02:52 -0400
committerChris McDonough <chrism@plope.com>2012-06-17 10:02:52 -0400
commitb616f4d1795f4980ccd10d3ff259e32da1c4664a (patch)
tree1557bec5ed003cd4510bfdf3c66d5dd4fd636cf7 /CONTRIBUTORS.txt
parent5276e011565b24c5ff9bf76577166e08a01cbf03 (diff)
parent4761ec79e1f3e0daeb4ba8351c27eb2a715f07a4 (diff)
downloadpyramid-b616f4d1795f4980ccd10d3ff259e32da1c4664a.tar.gz
pyramid-b616f4d1795f4980ccd10d3ff259e32da1c4664a.tar.bz2
pyramid-b616f4d1795f4980ccd10d3ff259e32da1c4664a.zip
merge 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 027fc0857..c3995aaba 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -174,3 +174,5 @@ Contributors
- Marin Rukavina, 2012/05/03
- Marc Abramowitz, 2012/06/13
+
+- Jeff Cook, 2012/06/16