Skip to content

Commit

Permalink
Merge branch 'master' of github.com:Pylons/pyramid
Browse files Browse the repository at this point in the history
  • Loading branch information
mcdonc committed Mar 29, 2012
2 parents 2c949d8 + 3cd6227 commit 9df502b
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions CONTRIBUTORS.txt
Original file line number Diff line number Diff line change
Expand Up @@ -168,3 +168,5 @@ Contributors
- Martijn Pieters, 2012/03/02

- Steve Piercy, 2012/03/27

- Wayne Witzel III, 2012/03/27

0 comments on commit 9df502b

Please sign in to comment.