summaryrefslogtreecommitdiff
path: root/CONTRIBUTORS.txt
diff options
context:
space:
mode:
Diffstat (limited to 'CONTRIBUTORS.txt')
-rw-r--r--CONTRIBUTORS.txt19
1 files changed, 18 insertions, 1 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 40234836e..1ef785c3d 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -90,7 +90,7 @@ Licensing Exceptions
Code committed within the ``docs/`` subdirectory of the Pyramid source
control repository and "docstrings" which appear in the documentation
-generated by runnning "make" within this directory is licensed under the
+generated by running "make" within this directory is licensed under the
Creative Commons Attribution-Noncommercial-Share Alike 3.0 United States
License (http://creativecommons.org/licenses/by-nc-sa/3.0/us/).
@@ -114,3 +114,20 @@ Contributors
- Blaise Laflamme, 2010/11/09
- Chris Rossi, 2010/11/10
+
+- Casey Duncan, 2010/12/27
+
+- Rob Miller, 2010/12/28
+
+- Marius Gedminas, 2010/12/31
+
+- Marcin Lulek, 2011/01/02
+
+- John Shipman, 2011/01/15
+
+- Wichert Akkerman, 2011/01/19
+
+- Christopher Lambacehr, 2011/02/12
+
+- Malthe Borch, 2011/02/28
+