diff options
| author | Bob Ippolito <bob@redivi.com> | 2013-01-11 10:16:50 -0800 |
|---|---|---|
| committer | Bob Ippolito <bob@redivi.com> | 2013-01-11 10:18:35 -0800 |
| commit | c3262f7394f6399aa4e5588604ec1e0d560353bc (patch) | |
| tree | 5c704ed842839550f60fc48edf2c471a2c93c7dd | |
| parent | 0cb8be97d96ef319f32666b5f5bd23ddcbb9066e (diff) | |
| download | simplejson-c3262f7394f6399aa4e5588604ec1e0d560353bc.tar.gz | |
This code is also licensed to the PSF under a Contributor Agreement.v3.0.7
| -rw-r--r-- | CHANGES.txt | 4 | ||||
| -rw-r--r-- | LICENSE.txt | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index ff43b3f..582eee7 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,7 +1,9 @@ Version 3.0.7 released 2013-10-11 * NOTE: this release only changes the license. -* simplejson is now dual-licensed software, MIT or AFL v2.1. +* simplejson is now dual-licensed software, MIT or AFL v2.1. It is + also made explicit that this code is also licensed to the PSF under + a Contributor Agreement. Version 3.0.6 released 2013-01-11 diff --git a/LICENSE.txt b/LICENSE.txt index ef32210..e05f49c 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,6 +1,8 @@ simplejson is dual-licensed software. It is available under the terms of the MIT license, or the Academic Free License version 2.1. The full -text of each license agreement is included below. +text of each license agreement is included below. This code is also +licensed to the Python Software Foundation (PSF) under a Contributor +Agreement. MIT License =========== |