summaryrefslogtreecommitdiff
path: root/CONTRIBUTORS.txt
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-02-13 11:42:40 -0500
committerChris McDonough <chrism@plope.com>2011-02-13 11:42:40 -0500
commit4a221e9845190651107d38a2195d43be9ee9281e (patch)
tree42e05124994329fbabac4ef9f8d0a35836ce7461 /CONTRIBUTORS.txt
parent296ee25ffb1405b7a5a12caf62fe5b1ed2aaed7b (diff)
parent86bbe8bddb1a0e62e7cd811cf2df0d57d72827dc (diff)
downloadpyramid-4a221e9845190651107d38a2195d43be9ee9281e.tar.gz
pyramid-4a221e9845190651107d38a2195d43be9ee9281e.tar.bz2
pyramid-4a221e9845190651107d38a2195d43be9ee9281e.zip
Merge branch 'master' of https://github.com/lambacck/pyramid into lambacck-master
Diffstat (limited to 'CONTRIBUTORS.txt')
-rw-r--r--CONTRIBUTORS.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 9828f7144..dba39d630 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -126,3 +126,5 @@ Contributors
- John Shipman, 2011/01/15
- Wichert Akkerman, 2011/01/19
+
+- Christopher Lambacehr, 2011/02/12