diff options
| author | Chris McDonough <chrism@plope.com> | 2012-02-19 11:07:14 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2012-02-19 11:07:14 -0500 |
| commit | 8d9aafb56f00506109cce444e6037cba63428ad4 (patch) | |
| tree | 42a99b30e4b874811fcb636c2759eed09a1e0be9 /CONTRIBUTORS.txt | |
| parent | d21ba4b61e901b27ceae36f29dac23387a8129d5 (diff) | |
| parent | 9f2cf5c8921184a29830ed7cb9c283ae547c80f2 (diff) | |
| download | pyramid-8d9aafb56f00506109cce444e6037cba63428ad4.tar.gz pyramid-8d9aafb56f00506109cce444e6037cba63428ad4.tar.bz2 pyramid-8d9aafb56f00506109cce444e6037cba63428ad4.zip | |
Merge branch '1.3-branch' of github.com:Pylons/pyramid into 1.3-branch
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 050225b5b..a3c1ab35b 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -160,3 +160,5 @@ Contributors - Klee Dienes, 2011/10/30 - Michael Ryabushin, 2011/12/14 + +- Mike Orr, 2012/02/14 |