diff options
| author | Carlos de la Guardia <cguardia@yahoo.com> | 2011-06-06 12:03:46 -0500 |
|---|---|---|
| committer | Carlos de la Guardia <cguardia@yahoo.com> | 2011-06-06 12:03:46 -0500 |
| commit | a5713863a80a493a1485057609578b907d04c770 (patch) | |
| tree | e2230d20775d9fa80ea8dafa06910b65cb6859d5 /CONTRIBUTORS.txt | |
| parent | ffca4ef5eba01234433bc4d6029dee719ab261d0 (diff) | |
| parent | 703e3677dc42518cb80626650aaf62e7db17812a (diff) | |
| download | pyramid-a5713863a80a493a1485057609578b907d04c770.tar.gz pyramid-a5713863a80a493a1485057609578b907d04c770.tar.bz2 pyramid-a5713863a80a493a1485057609578b907d04c770.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 |