summaryrefslogtreecommitdiff
path: root/CONTRIBUTORS.txt
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2013-04-01 11:44:49 -0500
committerMichael Merickel <michael@merickel.org>2013-04-01 11:44:49 -0500
commit1bb01464b86e85fa92913db954a3bd81eb637866 (patch)
treeb017c20d5138a9f6ccb1d9723ac0323b85a03664 /CONTRIBUTORS.txt
parentc6587944a116ae8516b79a24f6161539c52c0f7e (diff)
parent961ff441cfdf3c4c963619e0f5476121c8880840 (diff)
downloadpyramid-1bb01464b86e85fa92913db954a3bd81eb637866.tar.gz
pyramid-1bb01464b86e85fa92913db954a3bd81eb637866.tar.bz2
pyramid-1bb01464b86e85fa92913db954a3bd81eb637866.zip
Merge branch 'fix.950' of Beanfield/pyramid into pull.952
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 94eee9443..97eb54f7b 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -196,3 +196,5 @@ Contributors
- Bert JW Regeer, 2013/02/01
- Georges Dubus, 2013/03/21
+
+- Jason McKellar, 2013/03/28