summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-07-22 20:16:46 -0700
committerChris McDonough <chrism@plope.com>2011-07-22 20:16:46 -0700
commita8b55fa5408aa46e1beefaf66b928cccfabdf5a8 (patch)
tree619fbed46fea76721727a3d98ce2cdc742e9cf5f
parent15ac15d60e788c087facfce85b1ead9f7dd4c3ae (diff)
parentfa360e3b5dbc9866325a6a2c39279cb11f6b2918 (diff)
downloadpyramid-a8b55fa5408aa46e1beefaf66b928cccfabdf5a8.tar.gz
pyramid-a8b55fa5408aa46e1beefaf66b928cccfabdf5a8.tar.bz2
pyramid-a8b55fa5408aa46e1beefaf66b928cccfabdf5a8.zip
Merge pull request #241 from hathawsh/master
Please accept my signature of the contributor's agreement.
-rw-r--r--CONTRIBUTORS.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index cdc011f87..4e9d944ea 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -142,3 +142,5 @@ Contributors
- Michael Merickel, 2011/5/25
- Christoph Zwerschke, 2011/06/07
+
+- Shane Hathaway, 2011/07/22