Permalink
Browse files

Merge pull request #1934 from kennethreitz/update-notice

Charade -> Chardet and Add cacert.pem license
  • Loading branch information...
2 parents e909a92 + 64f0b3c commit 9a14086e6d6e1991b3dfae004622e5f13a53f077 @Lukasa Lukasa committed Mar 2, 2014
Showing with 5 additions and 17 deletions.
  1. +5 −17 NOTICE
View
22 NOTICE
@@ -24,8 +24,8 @@ FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TOR
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
-Charade License
-================
+Chardet License
+===============
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -46,18 +46,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
CA Bundle License
=================
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-02110-1301
-
+This Source Code Form is subject to the terms of the Mozilla Public
+License, v. 2.0. If a copy of the MPL was not distributed with this
+file, You can obtain one at http://mozilla.org/MPL/2.0/.

0 comments on commit 9a14086

Please sign in to comment.