summaryrefslogtreecommitdiff
path: root/CONTRIBUTORS.txt
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-08-29 16:06:40 -0400
committerChris McDonough <chrism@plope.com>2012-08-29 16:06:40 -0400
commita7051f17a6f352193b4f4b7f1bcc635dff452001 (patch)
tree33b3a6d6994137b6423f2f4d9ac2dc1a0e3ab717 /CONTRIBUTORS.txt
parent8b55a68adb54783895a91a9e1af800a7f8f22c07 (diff)
parenta9289d95036eb23e973815e529d3db3fea235046 (diff)
downloadpyramid-a7051f17a6f352193b4f4b7f1bcc635dff452001.tar.gz
pyramid-a7051f17a6f352193b4f4b7f1bcc635dff452001.tar.bz2
pyramid-a7051f17a6f352193b4f4b7f1bcc635dff452001.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'CONTRIBUTORS.txt')
-rw-r--r--CONTRIBUTORS.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index a2da7fbfd..264acf048 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -173,8 +173,12 @@ Contributors
- Marin Rukavina, 2012/05/03
+- Lorenzo M. Catucci, 2012/06/08
+
- Marc Abramowitz, 2012/06/13
- Jeff Cook, 2012/06/16
+- Ian Wilson, 2012/06/17
+
- Roman Kozlovskyi, 2012/08/11