summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-03-29 05:05:14 -0400
committerChris McDonough <chrism@plope.com>2012-03-29 05:05:14 -0400
commit9df502b57c4c571062e83f418640a629a1a56b80 (patch)
tree1ef514751384d4e0f13d1092d20c9a132df23c3f
parent2c949d8557ee8c7f9f75797f79ec911b93f60291 (diff)
parent3cd62272f5dc8d17368a7a00969542ac9a7af85e (diff)
downloadpyramid-9df502b57c4c571062e83f418640a629a1a56b80.tar.gz
pyramid-9df502b57c4c571062e83f418640a629a1a56b80.tar.bz2
pyramid-9df502b57c4c571062e83f418640a629a1a56b80.zip
Merge branch 'master' of github.com:Pylons/pyramid
-rw-r--r--CONTRIBUTORS.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index c00170d09..365e3e455 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -168,3 +168,5 @@ Contributors
- Martijn Pieters, 2012/03/02
- Steve Piercy, 2012/03/27
+
+- Wayne Witzel III, 2012/03/27