diff options
| author | Chris McDonough <chrism@plope.com> | 2012-03-02 13:49:29 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2012-03-02 13:49:29 -0500 |
| commit | 56734324a8550a706320aa784e8435f1cfaf9b50 (patch) | |
| tree | 8ec004917b050348eb54fe3af0d68957c3e9729f /CONTRIBUTORS.txt | |
| parent | f5a1a3cf957001ee338ee02502a1a0654fb694ca (diff) | |
| parent | 78fd242716d6a1d789244dffe142eef680310181 (diff) | |
| download | pyramid-56734324a8550a706320aa784e8435f1cfaf9b50.tar.gz pyramid-56734324a8550a706320aa784e8435f1cfaf9b50.tar.bz2 pyramid-56734324a8550a706320aa784e8435f1cfaf9b50.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 f1ce18e71..a402d49e6 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -164,3 +164,5 @@ Contributors - Mike Orr, 2012/02/14 - Paul M. Winkler, 2012/02/22 + +- Martijn Pieters, 2012/03/02 |