summaryrefslogtreecommitdiff
path: root/CONTRIBUTORS.txt
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-12-14 20:36:40 -0500
committerChris McDonough <chrism@plope.com>2011-12-14 20:36:40 -0500
commitc45c29fe5ce316d42965e5a84a1fb195a5320456 (patch)
tree99651b99eabee79905288e33c96f19c1f6807067 /CONTRIBUTORS.txt
parenta1995a197b735b2d1bbf674a5a6a82c359b5131f (diff)
parent6747aa8072b645a302a218d36283045c2a8381c6 (diff)
downloadpyramid-c45c29fe5ce316d42965e5a84a1fb195a5320456.tar.gz
pyramid-c45c29fe5ce316d42965e5a84a1fb195a5320456.tar.bz2
pyramid-c45c29fe5ce316d42965e5a84a1fb195a5320456.zip
Merge branch 'master' of github.com:Pylons/pyramid
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