summaryrefslogtreecommitdiff
path: root/CONTRIBUTORS.txt
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-01-19 12:52:46 -0500
committerChris McDonough <chrism@plope.com>2011-01-19 12:52:46 -0500
commitc28aa255d767955c5f2764ab39da124eb2f77f04 (patch)
tree8b20c7c3fbffc23b37d2c1fa63a0ba744d6117dd /CONTRIBUTORS.txt
parente4e97b22f60df2e73c91cf3eb16c53bb2b468515 (diff)
parentf47d110b758cedff324c3f6605515fe416a23cd0 (diff)
downloadpyramid-c28aa255d767955c5f2764ab39da124eb2f77f04.tar.gz
pyramid-c28aa255d767955c5f2764ab39da124eb2f77f04.tar.bz2
pyramid-c28aa255d767955c5f2764ab39da124eb2f77f04.zip
Merge git://github.com/wichert/pyramid into wichert-master
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 ce8aa75db..9828f7144 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -124,3 +124,5 @@ Contributors
- Marcin Lulek, 2011/01/02
- John Shipman, 2011/01/15
+
+- Wichert Akkerman, 2011/01/19