diff options
| author | Chris McDonough <chrism@plope.com> | 2011-01-03 03:10:34 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-01-03 03:10:34 -0500 |
| commit | c089d1538884704b55b1b8ffb5aad7c51ba2d3cb (patch) | |
| tree | 4729e7ff7778d05c5d4f73818343b7bd70fb8b09 /CONTRIBUTORS.txt | |
| parent | 070a798934bd39223fad37471e8e2168d78909a2 (diff) | |
| parent | 5653d13e554433adf34fd81b2c6593a54e7c4ea1 (diff) | |
| download | pyramid-c089d1538884704b55b1b8ffb5aad7c51ba2d3cb.tar.gz pyramid-c089d1538884704b55b1b8ffb5aad7c51ba2d3cb.tar.bz2 pyramid-c089d1538884704b55b1b8ffb5aad7c51ba2d3cb.zip | |
Merge branch '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 |