diff options
| author | Chris McDonough <chrism@plope.com> | 2012-02-26 13:59:30 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2012-02-26 13:59:30 -0500 |
| commit | 07965cded9e91cd4ebeceff15043ce1005261fa2 (patch) | |
| tree | 04d921becb71e2dc932ceb5436ceea9b8f1d2129 | |
| parent | 0d3efac2d59c2f80b63483915c384e6ac365dce8 (diff) | |
| parent | b5304ca1f9ffc23d08016d348a93d16d8c1283ac (diff) | |
| download | pyramid-07965cded9e91cd4ebeceff15043ce1005261fa2.tar.gz pyramid-07965cded9e91cd4ebeceff15043ce1005261fa2.tar.bz2 pyramid-07965cded9e91cd4ebeceff15043ce1005261fa2.zip | |
Merge branch 'master' into 1.3-branch
| -rw-r--r-- | CONTRIBUTORS.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index a3c1ab35b..f1ce18e71 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -16,7 +16,7 @@ Treatment of Account Contributor will not allow anyone other than the Contributor to use his or her username or source repository login to submit code to a Pylons Project source repository. Should Contributor become aware of any such use, -Contributor will immediately by notifying Agendaless Consulting. +Contributor will immediately notify Agendaless Consulting. Notification must be performed by sending an email to webmaster@agendaless.com. Until such notice is received, Contributor will be presumed to have taken all actions made through Contributor's account. If the @@ -162,3 +162,5 @@ Contributors - Michael Ryabushin, 2011/12/14 - Mike Orr, 2012/02/14 + +- Paul M. Winkler, 2012/02/22 |