diff options
| author | Chris McDonough <chrism@plope.com> | 2011-06-11 05:43:16 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-06-11 05:43:16 -0400 |
| commit | a4d5525cdbb6b7e614939b20a340b989258779ca (patch) | |
| tree | 666586b1a0293a04fe3ed4bc27eeddbd680e4311 /CONTRIBUTORS.txt | |
| parent | aee35e30083acd3d3c84e7f50db1f17bf6dc2d12 (diff) | |
| parent | b1b9f99e9a2e249cff61f4ccc0ecf10ac734fa08 (diff) | |
| download | pyramid-a4d5525cdbb6b7e614939b20a340b989258779ca.tar.gz pyramid-a4d5525cdbb6b7e614939b20a340b989258779ca.tar.bz2 pyramid-a4d5525cdbb6b7e614939b20a340b989258779ca.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
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 2873ce1b6..cdc011f87 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -140,3 +140,5 @@ Contributors - Philip Jenvey, 2011/04/24 - Michael Merickel, 2011/5/25 + +- Christoph Zwerschke, 2011/06/07 |