summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-11-18 21:50:29 -0500
committerChris McDonough <chrism@plope.com>2012-11-18 21:50:29 -0500
commite2bacf5565b86dd3394996b8b503ea87da479340 (patch)
tree3b4b206aca9d9bf74ad4949fe218d760b8813bdf
parent0ccdc23f6ec53548bb1f81f3b528f2a8be0a5467 (diff)
parentc59570727a1555c9f1f493d6db8e973f09ab0883 (diff)
downloadpyramid-e2bacf5565b86dd3394996b8b503ea87da479340.tar.gz
pyramid-e2bacf5565b86dd3394996b8b503ea87da479340.tar.bz2
pyramid-e2bacf5565b86dd3394996b8b503ea87da479340.zip
Merge branch 'sontek-add_contributors'
-rw-r--r--CONTRIBUTORS.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 34d904d0f..971c172f8 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -190,3 +190,5 @@ Contributors
- David Gay, 2012/09/16
- Robert Jackiewicz, 2012/11/12
+
+- John Anderson, 2012/11/14