diff options
| author | Chris McDonough <chrism@plope.com> | 2011-08-10 20:20:17 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-08-10 20:20:17 -0400 |
| commit | 389c11dd193cb6eff707effb11bfe9589171c57c (patch) | |
| tree | e5e57108a3d751d9e02cbf06ad5eca8902f4a100 /CONTRIBUTORS.txt | |
| parent | 3e3fcdf1376218a4fa6dcffec4f27a41c63d1675 (diff) | |
| parent | 995466c6bc0da04f50d2db83af653362a0dadd6f (diff) | |
| download | pyramid-389c11dd193cb6eff707effb11bfe9589171c57c.tar.gz pyramid-389c11dd193cb6eff707effb11bfe9589171c57c.tar.bz2 pyramid-389c11dd193cb6eff707effb11bfe9589171c57c.zip | |
Merge branch 'aodag-master'
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 a165c0dc6..a368fb4d2 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -143,6 +143,8 @@ Contributors - Christoph Zwerschke, 2011/06/07 +- Atsushi Odagiri, 2011/07/02 + - Shane Hathaway, 2011/07/22 - Manuel Hermann, 2011/07/11 |