summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2013-03-21 11:01:14 -0500
committerMichael Merickel <michael@merickel.org>2013-03-21 11:01:14 -0500
commit105160e062db79b44f7044c9729bc854ca8dfddf (patch)
tree73f460dd82868a72296f57cf7980f847f4e8f0dc
parent38844f75e4a2cd85315f1d570b5b63d00ec1b0b4 (diff)
parent6852ecdc9b50e97b3b230358e098a93953675de5 (diff)
downloadpyramid-105160e062db79b44f7044c9729bc854ca8dfddf.tar.gz
pyramid-105160e062db79b44f7044c9729bc854ca8dfddf.tar.bz2
pyramid-105160e062db79b44f7044c9729bc854ca8dfddf.zip
Merge branch 'pull.930'
-rw-r--r--CONTRIBUTORS.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 02fb81528..94eee9443 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -194,3 +194,5 @@ Contributors
- John Anderson, 2012/11/14
- Bert JW Regeer, 2013/02/01
+
+- Georges Dubus, 2013/03/21