diff options
| author | Michael Merickel <michael@merickel.org> | 2013-03-19 16:17:00 -0700 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2013-03-19 16:17:00 -0700 |
| commit | 813eb45a18fb040bf211b5bf1b0164d5dbca678c (patch) | |
| tree | 7be18eb7f977b6c6974b5864f8bb9b39926d9afa /CONTRIBUTORS.txt | |
| parent | 5491a8e4da58d08279d6023a33d76369296e94f7 (diff) | |
| parent | 4b711020a33bcbcc931132c2333d9c819dbac344 (diff) | |
| download | pyramid-813eb45a18fb040bf211b5bf1b0164d5dbca678c.tar.gz pyramid-813eb45a18fb040bf211b5bf1b0164d5dbca678c.tar.bz2 pyramid-813eb45a18fb040bf211b5bf1b0164d5dbca678c.zip | |
Merge branch 'bugfix/ipv6_compat' of bertjwregeer/pyramid into fix.831
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 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 |