diff options
| author | Michael Merickel <michael@merickel.org> | 2013-03-21 11:00:10 -0500 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2013-03-21 11:00:10 -0500 |
| commit | 6852ecdc9b50e97b3b230358e098a93953675de5 (patch) | |
| tree | 73f460dd82868a72296f57cf7980f847f4e8f0dc /CONTRIBUTORS.txt | |
| parent | 38844f75e4a2cd85315f1d570b5b63d00ec1b0b4 (diff) | |
| parent | 468837972b0185695073f530d0fb976637c90285 (diff) | |
| download | pyramid-6852ecdc9b50e97b3b230358e098a93953675de5.tar.gz pyramid-6852ecdc9b50e97b3b230358e098a93953675de5.tar.bz2 pyramid-6852ecdc9b50e97b3b230358e098a93953675de5.zip | |
Merge branch 'master' of madjar/pyramid into pull.930
Diffstat (limited to 'CONTRIBUTORS.txt')
| -rw-r--r-- | CONTRIBUTORS.txt | 2 |
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 |