summaryrefslogtreecommitdiff
path: root/CONTRIBUTORS.txt
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-03-19 16:54:20 -0700
committerChris McDonough <chrism@plope.com>2013-03-19 16:54:20 -0700
commit2f7aa7c6a7740f58744d51bdeaaf25a3e037d32c (patch)
treef13caa93c1c3b9bad3b0068a37c343735e324718 /CONTRIBUTORS.txt
parent05a7625562532f96d4f94d6568b7b753740607a0 (diff)
parent411acbba3402aba9d09856a0c4cb88f572ba77da (diff)
downloadpyramid-2f7aa7c6a7740f58744d51bdeaaf25a3e037d32c.tar.gz
pyramid-2f7aa7c6a7740f58744d51bdeaaf25a3e037d32c.tar.bz2
pyramid-2f7aa7c6a7740f58744d51bdeaaf25a3e037d32c.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 971c172f8..02fb81528 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -192,3 +192,5 @@ Contributors
- Robert Jackiewicz, 2012/11/12
- John Anderson, 2012/11/14
+
+- Bert JW Regeer, 2013/02/01