summaryrefslogtreecommitdiff
path: root/CONTRIBUTORS.txt
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-07-28 16:56:20 -0400
committerChris McDonough <chrism@plope.com>2011-07-28 16:56:20 -0400
commitbe631daa6812a004cdf52353cfca2bd6255f7135 (patch)
tree15fb46334e15940ebdf40b4a16ddb93c821f133d /CONTRIBUTORS.txt
parentd8d14a474ac84a58d3545768fecd3fe1c78219c0 (diff)
parent1d38fdf1d58af73f224f4c92dbbc90fb1803ca64 (diff)
downloadpyramid-be631daa6812a004cdf52353cfca2bd6255f7135.tar.gz
pyramid-be631daa6812a004cdf52353cfca2bd6255f7135.tar.bz2
pyramid-be631daa6812a004cdf52353cfca2bd6255f7135.zip
merge
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 4e9d944ea..a165c0dc6 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -144,3 +144,5 @@ Contributors
- Christoph Zwerschke, 2011/06/07
- Shane Hathaway, 2011/07/22
+
+- Manuel Hermann, 2011/07/11