diff options
| author | Chris McDonough <chrism@plope.com> | 2011-07-23 14:02:53 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-07-23 14:02:53 -0400 |
| commit | 3835781dab5791282073252d2cee685668bc7b1e (patch) | |
| tree | e19be2ec32d516b85e2e5a89e7e8935caf517b4a /CONTRIBUTORS.txt | |
| parent | 070bfdbaa6f3cffbda3a0bfe86534e24ea01142c (diff) | |
| parent | 566a276a37fad8073206b46ec77b27498a126f02 (diff) | |
| download | pyramid-3835781dab5791282073252d2cee685668bc7b1e.tar.gz pyramid-3835781dab5791282073252d2cee685668bc7b1e.tar.bz2 pyramid-3835781dab5791282073252d2cee685668bc7b1e.zip | |
Merge branch 'master' into wrapviews
Diffstat (limited to 'CONTRIBUTORS.txt')
| -rw-r--r-- | CONTRIBUTORS.txt | 2 |
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 |