diff options
| author | Chris McDonough <chrism@plope.com> | 2011-01-19 12:54:19 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-01-19 12:54:19 -0500 |
| commit | 4e370eb5ea657177e2c800ca86d2f6376cc9c991 (patch) | |
| tree | 72b657a42ec23864f1b89bade33bea87a16bcdc8 /CONTRIBUTORS.txt | |
| parent | cf0c36c429e29aa8d83f63324f8730a36ca8212e (diff) | |
| parent | c28aa255d767955c5f2764ab39da124eb2f77f04 (diff) | |
| download | pyramid-4e370eb5ea657177e2c800ca86d2f6376cc9c991.tar.gz pyramid-4e370eb5ea657177e2c800ca86d2f6376cc9c991.tar.bz2 pyramid-4e370eb5ea657177e2c800ca86d2f6376cc9c991.zip | |
Merge branch 'wichert-master'
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 ce8aa75db..9828f7144 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -124,3 +124,5 @@ Contributors - Marcin Lulek, 2011/01/02 - John Shipman, 2011/01/15 + +- Wichert Akkerman, 2011/01/19 |