diff options
| author | Mike Orr <sluggoster@gmail.com> | 2012-02-18 23:09:33 -0800 |
|---|---|---|
| committer | Mike Orr <sluggoster@gmail.com> | 2012-02-18 23:09:33 -0800 |
| commit | 9f2cf5c8921184a29830ed7cb9c283ae547c80f2 (patch) | |
| tree | e6901c9ccf3552f4e125ae7c48e433b11781392f /CONTRIBUTORS.txt | |
| parent | 7f89e2d6c727d3022b38f09d72921afd9302a39c (diff) | |
| parent | 94c28eb885204f93222dcc0bb3340ae1514b62dd (diff) | |
| download | pyramid-9f2cf5c8921184a29830ed7cb9c283ae547c80f2.tar.gz pyramid-9f2cf5c8921184a29830ed7cb9c283ae547c80f2.tar.bz2 pyramid-9f2cf5c8921184a29830ed7cb9c283ae547c80f2.zip | |
Merge branch 'mso' 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 |