# HG changeset patch # User Bob Ippolito <bob@redivi.com> # Date 1357928210 28800 # Fri Jan 11 10:16:50 2013 -0800 # Node ID b1f93dcc6f510527eb601b9fe1e549bbdea68805 # Parent ab58411534d009569efc789b014c01dfa693875d This code is also licensed to the PSF under a Contributor Agreement. diff --git a/CHANGES.txt b/CHANGES.txt --- 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 --- 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 ===========