diff options
| author | Rob Miller <rob@mochimedia.com> | 2010-12-30 18:08:01 -0800 |
|---|---|---|
| committer | Rob Miller <rob@mochimedia.com> | 2010-12-30 18:08:01 -0800 |
| commit | 4f355b634b32b77c6b35ddc31dfa772f075bf2ee (patch) | |
| tree | 366325dba594937e55e0e178380ed091b5c72b44 /CONTRIBUTORS.txt | |
| parent | ae40397a29b6fc3068a61c5e7acc7e3f7d801086 (diff) | |
| parent | 994fe8d880326e00de6b42720c1c71b2627747f9 (diff) | |
| download | pyramid-4f355b634b32b77c6b35ddc31dfa772f075bf2ee.tar.gz pyramid-4f355b634b32b77c6b35ddc31dfa772f075bf2ee.tar.bz2 pyramid-4f355b634b32b77c6b35ddc31dfa772f075bf2ee.zip | |
Merge branch 'refs/heads/master' into viewderiver
Conflicts:
CONTRIBUTORS.txt
Diffstat (limited to 'CONTRIBUTORS.txt')
| -rw-r--r-- | CONTRIBUTORS.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 443503914..7b0364b6d 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -90,7 +90,7 @@ Licensing Exceptions Code committed within the ``docs/`` subdirectory of the Pyramid source control repository and "docstrings" which appear in the documentation -generated by runnning "make" within this directory is licensed under the +generated by running "make" within this directory is licensed under the Creative Commons Attribution-Noncommercial-Share Alike 3.0 United States License (http://creativecommons.org/licenses/by-nc-sa/3.0/us/). @@ -118,3 +118,5 @@ Contributors - Casey Duncan, 2010/12/27 - Rob Miller, 2010/12/28 + +- Marius Gedminas, 2010/12/31 |