diff options
| author | Chris McDonough <chrism@plope.com> | 2012-06-17 10:00:44 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2012-06-17 10:00:44 -0400 |
| commit | 5276e011565b24c5ff9bf76577166e08a01cbf03 (patch) | |
| tree | ceb2ef21bc644ccce72d82a0799f68c260534f52 /CONTRIBUTORS.txt | |
| parent | c7fcdf1665cfdc1173559baa0a56d9a06fcba448 (diff) | |
| parent | eb3c87230402201669501d5889d43634b785a9ed (diff) | |
| download | pyramid-5276e011565b24c5ff9bf76577166e08a01cbf03.tar.gz pyramid-5276e011565b24c5ff9bf76577166e08a01cbf03.tar.bz2 pyramid-5276e011565b24c5ff9bf76577166e08a01cbf03.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 98f73d5f9..027fc0857 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -172,3 +172,5 @@ Contributors - Wayne Witzel III, 2012/03/27 - Marin Rukavina, 2012/05/03 + +- Marc Abramowitz, 2012/06/13 |