diff options
| author | Mike Orr <sluggoster@gmail.com> | 2012-02-18 23:04:55 -0800 |
|---|---|---|
| committer | Mike Orr <sluggoster@gmail.com> | 2012-02-18 23:04:55 -0800 |
| commit | b9ea8c57e22ca7821eb30698b3cc6faf9ef2c3f3 (patch) | |
| tree | c37a507a7030fbae713d2f582ed8afae4d89cbae /CONTRIBUTORS.txt | |
| parent | 5baff75c94768628e777ec74fe8f653ef69dd0db (diff) | |
| parent | 94c28eb885204f93222dcc0bb3340ae1514b62dd (diff) | |
| download | pyramid-b9ea8c57e22ca7821eb30698b3cc6faf9ef2c3f3.tar.gz pyramid-b9ea8c57e22ca7821eb30698b3cc6faf9ef2c3f3.tar.bz2 pyramid-b9ea8c57e22ca7821eb30698b3cc6faf9ef2c3f3.zip | |
Merge branch 'mso'
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 |