summaryrefslogtreecommitdiff
path: root/CONTRIBUTORS.txt
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-11-16 05:06:48 -0500
committerChris McDonough <chrism@plope.com>2013-11-16 05:06:48 -0500
commit94b754aac45e235b5b11a60489395b77c8195fdc (patch)
treea010c1902e3606ca58e040fffb459725e8ebc2ac /CONTRIBUTORS.txt
parent4aafb2bc4289ff4a113e547bea8ba301756e965e (diff)
parenta0ef135f2ad6e4425eec7ffcc0839b605347c346 (diff)
downloadpyramid-94b754aac45e235b5b11a60489395b77c8195fdc.tar.gz
pyramid-94b754aac45e235b5b11a60489395b77c8195fdc.tar.bz2
pyramid-94b754aac45e235b5b11a60489395b77c8195fdc.zip
Merge branch 'ztane-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 6dba1076e..63528e662 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -226,3 +226,5 @@ Contributors
- Karl O. Pinc, 2013/09/27
- Matthew Russell, 2013/10/14
+
+- Antti Haapala, 2013/11/15