diff options
| author | Chris McDonough <chrism@plope.com> | 2011-01-03 02:37:45 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-01-03 02:37:45 -0500 |
| commit | 83373586ea80ea5057da5fc4ede43278af47a318 (patch) | |
| tree | bb29ad6d816873da3ae9f8a9d78453d8929d0ed2 /CONTRIBUTORS.txt | |
| parent | 070a798934bd39223fad37471e8e2168d78909a2 (diff) | |
| parent | b23e6e4a939ddaf764137828539f63df6077f4c7 (diff) | |
| download | pyramid-83373586ea80ea5057da5fc4ede43278af47a318.tar.gz pyramid-83373586ea80ea5057da5fc4ede43278af47a318.tar.bz2 pyramid-83373586ea80ea5057da5fc4ede43278af47a318.zip | |
Merge branch 'master' of https://github.com/ergo/pyramid into ergo-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 7b0364b6d..ec9042f08 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -120,3 +120,5 @@ Contributors - Rob Miller, 2010/12/28 - Marius Gedminas, 2010/12/31 + +- Marcin Lulek, 2011/01/02
\ No newline at end of file |