diff options
| author | Chris McDonough <chrism@plope.com> | 2011-05-25 21:56:01 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-05-25 21:56:01 -0400 |
| commit | 0a3692d2a83c2085a835b44eadb7d16582551d81 (patch) | |
| tree | 91ba4f2d279b68d9f413df035f28fb0ffb9d4443 /CONTRIBUTORS.txt | |
| parent | 2ce65257cce304bd0f14d3b1bd4fd83ab957398b (diff) | |
| parent | 1e729275e1fb993bf32a24dd1d2e6c2b79878291 (diff) | |
| download | pyramid-0a3692d2a83c2085a835b44eadb7d16582551d81.tar.gz pyramid-0a3692d2a83c2085a835b44eadb7d16582551d81.tar.bz2 pyramid-0a3692d2a83c2085a835b44eadb7d16582551d81.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
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 f2195de70..2873ce1b6 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -138,3 +138,5 @@ Contributors - Juliusz Gonera, 2011/04/17 - Philip Jenvey, 2011/04/24 + +- Michael Merickel, 2011/5/25 |