diff options
| author | Chris McDonough <chrism@plope.com> | 2011-11-07 18:24:12 -0800 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-11-07 18:24:12 -0800 |
| commit | 2da8c01bb965188f497c9f3a5dde1287b8c7056b (patch) | |
| tree | c2387a823ea1406582dc77ca6b35cf6d4bab4cae /CONTRIBUTORS.txt | |
| parent | eb6298ca370ee5fcf390e85769f928a85f7060e8 (diff) | |
| parent | eb7fc0fb218a610621d76a8d9b804d1b708f918e (diff) | |
| download | pyramid-2da8c01bb965188f497c9f3a5dde1287b8c7056b.tar.gz pyramid-2da8c01bb965188f497c9f3a5dde1287b8c7056b.tar.bz2 pyramid-2da8c01bb965188f497c9f3a5dde1287b8c7056b.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'CONTRIBUTORS.txt')
| -rw-r--r-- | CONTRIBUTORS.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index e1af0aab1..2654801c3 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -154,3 +154,5 @@ Contributors - Chris Shenton, 2011/11/07 - Ken Manheimer, 2011/11/07 + +- Reed O'Brien, 2011/11/07 |