diff options
| author | Chris McDonough <chrism@plope.com> | 2012-06-17 10:03:20 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2012-06-17 10:03:20 -0400 |
| commit | 3da92290bfaa8b4072019c916e75cd96ebc0f6dc (patch) | |
| tree | 1557bec5ed003cd4510bfdf3c66d5dd4fd636cf7 /CONTRIBUTORS.txt | |
| parent | 5276e011565b24c5ff9bf76577166e08a01cbf03 (diff) | |
| parent | b616f4d1795f4980ccd10d3ff259e32da1c4664a (diff) | |
| download | pyramid-3da92290bfaa8b4072019c916e75cd96ebc0f6dc.tar.gz pyramid-3da92290bfaa8b4072019c916e75cd96ebc0f6dc.tar.bz2 pyramid-3da92290bfaa8b4072019c916e75cd96ebc0f6dc.zip | |
Merge branch 'sjuxax-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 027fc0857..c3995aaba 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -174,3 +174,5 @@ Contributors - Marin Rukavina, 2012/05/03 - Marc Abramowitz, 2012/06/13 + +- Jeff Cook, 2012/06/16 |