summaryrefslogtreecommitdiff
path: root/CONTRIBUTORS.txt
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2013-03-19 16:20:11 -0700
committerMichael Merickel <michael@merickel.org>2013-03-19 16:20:11 -0700
commit411acbba3402aba9d09856a0c4cb88f572ba77da (patch)
treef13caa93c1c3b9bad3b0068a37c343735e324718 /CONTRIBUTORS.txt
parent5491a8e4da58d08279d6023a33d76369296e94f7 (diff)
parent23a7c6d7835ca0745968d522a6d9b329d45bc635 (diff)
downloadpyramid-411acbba3402aba9d09856a0c4cb88f572ba77da.tar.gz
pyramid-411acbba3402aba9d09856a0c4cb88f572ba77da.tar.bz2
pyramid-411acbba3402aba9d09856a0c4cb88f572ba77da.zip
Merge branch 'fix.831'
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