summaryrefslogtreecommitdiff
path: root/CONTRIBUTORS.txt
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2015-02-06 10:04:24 -0600
committerMichael Merickel <michael@merickel.org>2015-02-06 10:04:24 -0600
commit30608bcffa50bee9a37c825c6bd5899a0be3905a (patch)
tree07b8c7bcdc101d5ff7fd7e4faed9a7fe12365c1e /CONTRIBUTORS.txt
parent803ea0bf2d2c2d0354cc5d89fe627bc87c326081 (diff)
parentb5c0ea42424abf400683baf5dbfc2c41cf049ad1 (diff)
downloadpyramid-30608bcffa50bee9a37c825c6bd5899a0be3905a.tar.gz
pyramid-30608bcffa50bee9a37c825c6bd5899a0be3905a.tar.bz2
pyramid-30608bcffa50bee9a37c825c6bd5899a0be3905a.zip
Merge pull request #1541 from dairiki/bug.load-arg-deprecated
Prevent DeprecationWarning from setuptools>=11.3
Diffstat (limited to 'CONTRIBUTORS.txt')
-rw-r--r--CONTRIBUTORS.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index adf2224a5..319d41434 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -240,3 +240,5 @@ Contributors
- Adrian Teng, 2014/12/17
- Ilja Everila, 2015/02/05
+
+- Geoffrey T. Dairiki, 2015/02/06