summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos de la Guardia <cguardia@yahoo.com>2011-06-07 13:38:36 -0700
committerCarlos de la Guardia <cguardia@yahoo.com>2011-06-07 13:38:36 -0700
commitb1b9f99e9a2e249cff61f4ccc0ecf10ac734fa08 (patch)
tree666586b1a0293a04fe3ed4bc27eeddbd680e4311
parent11a067736a949101a7c24702afa3689977c4c26e (diff)
parent804ba0b2f434781e77d2b5191f1cd76a490f6610 (diff)
downloadpyramid-b1b9f99e9a2e249cff61f4ccc0ecf10ac734fa08.tar.gz
pyramid-b1b9f99e9a2e249cff61f4ccc0ecf10ac734fa08.tar.bz2
pyramid-b1b9f99e9a2e249cff61f4ccc0ecf10ac734fa08.zip
Merge pull request #209 from Cito/master
Signed the contributor agreement.
-rw-r--r--CONTRIBUTORS.txt2
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