summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-02-28 10:35:13 -0500
committerChris McDonough <chrism@plope.com>2011-02-28 10:35:13 -0500
commit66a7423c2c764674051f4db906b3d57469464aea (patch)
tree4bf277d023be78b6fcf380efc9ee65f111ece388
parent8326c68388ecac91cdcb1dce268a61362be2e4c8 (diff)
parent8750a7479e439bd6403d26279f9397ab4b938f9a (diff)
downloadpyramid-66a7423c2c764674051f4db906b3d57469464aea.tar.gz
pyramid-66a7423c2c764674051f4db906b3d57469464aea.tar.bz2
pyramid-66a7423c2c764674051f4db906b3d57469464aea.zip
Merge branch 'malthe-master'
-rw-r--r--CONTRIBUTORS.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index dba39d630..1ef785c3d 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -128,3 +128,6 @@ Contributors
- Wichert Akkerman, 2011/01/19
- Christopher Lambacehr, 2011/02/12
+
+- Malthe Borch, 2011/02/28
+