summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2010-11-09 23:20:48 -0500
committerChris McDonough <chrism@plope.com>2010-11-09 23:20:48 -0500
commitbff7ca3c088b2fac89670fd383b3824b23952b93 (patch)
tree417212388d6e14e3968c8eb59d575205e4472f55
parentfc7c37162d1b2820c13023bb5a7f7d9b2f3e0113 (diff)
parent51f60051e356cb8b9a5071799f7b72e759844312 (diff)
downloadpyramid-bff7ca3c088b2fac89670fd383b3824b23952b93.tar.gz
pyramid-bff7ca3c088b2fac89670fd383b3824b23952b93.tar.bz2
pyramid-bff7ca3c088b2fac89670fd383b3824b23952b93.zip
Merge branch 'master' of github.com:Pylons/pyramid
-rw-r--r--CONTRIBUTORS.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 43f6d1596..8216ff1cc 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -108,3 +108,7 @@ Contributors
- Chris McDonough, 2010/11/08
- Tres Seaver, 2010/11/09
+
+- Ben Bangert, 2010/11/09
+
+- Blaise Laflamme, 2010/11/09