diff options
| author | Chris McDonough <chrism@plope.com> | 2012-11-20 22:47:52 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2012-11-20 22:47:52 -0500 |
| commit | c6a575052ae14e515c288e77a452440030c1cdcd (patch) | |
| tree | 7bf6dc6f2b929e5a206aae6d751b0cda5d96aefd /CONTRIBUTORS.txt | |
| parent | 8f4fcc47c9405f20cfed3a40931f12534b3b7193 (diff) | |
| parent | b5e4443dd28f3d4ed6e767e06d658838575d159e (diff) | |
| download | pyramid-c6a575052ae14e515c288e77a452440030c1cdcd.tar.gz pyramid-c6a575052ae14e515c288e77a452440030c1cdcd.tar.bz2 pyramid-c6a575052ae14e515c288e77a452440030c1cdcd.zip | |
Merge branch 'master' into sontek-fix_commands
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 34d904d0f..971c172f8 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -190,3 +190,5 @@ Contributors - David Gay, 2012/09/16 - Robert Jackiewicz, 2012/11/12 + +- John Anderson, 2012/11/14 |