summaryrefslogtreecommitdiff
path: root/CONTRIBUTORS.txt
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-12-14 20:39:21 -0500
committerChris McDonough <chrism@plope.com>2011-12-14 20:39:21 -0500
commit3ee1022068481dea058064cf28c4bc114ca6bd51 (patch)
tree3353066003111f51d4dd6d36de82af968fd27b5a /CONTRIBUTORS.txt
parent9dce50a3bdd30b7c5c9b8efd184bad7cbbb1a030 (diff)
parentc45c29fe5ce316d42965e5a84a1fb195a5320456 (diff)
downloadpyramid-3ee1022068481dea058064cf28c4bc114ca6bd51.tar.gz
pyramid-3ee1022068481dea058064cf28c4bc114ca6bd51.tar.bz2
pyramid-3ee1022068481dea058064cf28c4bc114ca6bd51.zip
merge goodwill's changes from 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 a449333cb..050225b5b 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -158,3 +158,5 @@ Contributors
- Reed O'Brien, 2011/11/07
- Klee Dienes, 2011/10/30
+
+- Michael Ryabushin, 2011/12/14