summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2010-12-27 16:25:40 -0500
committerChris McDonough <chrism@plope.com>2010-12-27 16:25:40 -0500
commit368c2cadf8339735548b575838eb6fac6f3faeb5 (patch)
tree4bcc7ed411c270f7fecc0ae9679b7f8f443161fd
parent90a327b2cd9b9e6b27688dadcdf8125f091f242d (diff)
parentca114e4ff1a75f00699b6e7ba37052f39b5ed788 (diff)
downloadpyramid-368c2cadf8339735548b575838eb6fac6f3faeb5.tar.gz
pyramid-368c2cadf8339735548b575838eb6fac6f3faeb5.tar.bz2
pyramid-368c2cadf8339735548b575838eb6fac6f3faeb5.zip
Merge branch 'master' of github.com:Pylons/pyramid
-rw-r--r--CONTRIBUTORS.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 40234836e..b48e769a1 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -114,3 +114,6 @@ Contributors
- Blaise Laflamme, 2010/11/09
- Chris Rossi, 2010/11/10
+
+- Casey Duncan, 2010/12/27
+