diff options
| author | Karl O. Pinc <kop@meme.com> | 2013-10-02 15:07:20 -0500 |
|---|---|---|
| committer | Karl O. Pinc <kop@meme.com> | 2013-10-02 15:07:20 -0500 |
| commit | 1a2b37baf2c37e060cbbc6fd37812dd5c8078b5b (patch) | |
| tree | d02e465bf1402b571071a1f29a1a5b39aa6ebad8 /CONTRIBUTORS.txt | |
| parent | 68d16988404aec339fde1df7822c783d3ea23af6 (diff) | |
| parent | 678f49d2e08b128785e32ed6fc9e12df4713ad7c (diff) | |
| download | pyramid-1a2b37baf2c37e060cbbc6fd37812dd5c8078b5b.tar.gz pyramid-1a2b37baf2c37e060cbbc6fd37812dd5c8078b5b.tar.bz2 pyramid-1a2b37baf2c37e060cbbc6fd37812dd5c8078b5b.zip | |
Merge remote-tracking branch 'upstream/master' into doc_render
Doing something to make the pull request have the right stuff.
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 1a5b975d7..bfe22e540 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -222,3 +222,5 @@ Contributors - Takahiro Fujiwara, 2013/08/28 - Doug Hellmann, 2013/09/06 + +- Karl O. Pinc, 2013/09/27 |