summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-04-18 00:55:36 -0400
committerChris McDonough <chrism@plope.com>2011-04-18 00:55:36 -0400
commitd0eb2c06387db8a7ac27cb1292adea26aab11253 (patch)
treefe24225462013a836d9966c9a530e2923020b0ef
parent29a850643aea9452c4f09906505812cb03d7ef5c (diff)
parent9030d5e1ce5b7ed61533d28809449c282655bbf4 (diff)
downloadpyramid-d0eb2c06387db8a7ac27cb1292adea26aab11253.tar.gz
pyramid-d0eb2c06387db8a7ac27cb1292adea26aab11253.tar.bz2
pyramid-d0eb2c06387db8a7ac27cb1292adea26aab11253.zip
Merge branch 'master' of https://github.com/jgonera/pyramid into jgonera-master
-rw-r--r--CONTRIBUTORS.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 1ef785c3d..818a1af98 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -131,3 +131,5 @@ Contributors
- Malthe Borch, 2011/02/28
+- Juliusz Gonera, 2011/04/17
+