summaryrefslogtreecommitdiff
path: root/CONTRIBUTORS.txt
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-08-23 12:33:54 -0400
committerChris McDonough <chrism@plope.com>2012-08-23 12:33:54 -0400
commit0d9dccd259d52be9be2400cfe6ee5b709b812bfc (patch)
treeddb6d0174bab3a49c19e9f678c1c7ce4a43c5a8f /CONTRIBUTORS.txt
parentb9b4657e79e7e1ed1f0c79bf82c3fe19a0ab5687 (diff)
parent75a8ff4ad0ba8eed13592eb5e7a211da3035e209 (diff)
downloadpyramid-0d9dccd259d52be9be2400cfe6ee5b709b812bfc.tar.gz
pyramid-0d9dccd259d52be9be2400cfe6ee5b709b812bfc.tar.bz2
pyramid-0d9dccd259d52be9be2400cfe6ee5b709b812bfc.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