diff options
author | Michael Shuler <michael@pbandjelly.org> | 2012-06-21 10:02:21 -0500 |
---|---|---|
committer | Michael Shuler <michael@pbandjelly.org> | 2012-06-21 10:02:21 -0500 |
commit | faa351ca9c5ad1d7c2d37a58463ac6a079ff2883 (patch) | |
tree | dee98da7a94b3063e563868bd789fd11ac4c1836 /mozilla | |
parent | 597b608474b4168d8691ddcd6f1783f5e880515f (diff) | |
download | ca-certificates-faa351ca9c5ad1d7c2d37a58463ac6a079ff2883.tar.gz |
Update mozilla/certdata.txt to version 1.83
Mozilla Public License updated to v2.0
(No certificates added/removed.)
Update debian/copyright to reflect MPL v2.0
Diffstat (limited to 'mozilla')
-rw-r--r-- | mozilla/certdata.txt | 40 |
1 files changed, 4 insertions, 36 deletions
diff --git a/mozilla/certdata.txt b/mozilla/certdata.txt index 69209b1..68490fd 100644 --- a/mozilla/certdata.txt +++ b/mozilla/certdata.txt @@ -1,40 +1,8 @@ # -# ***** BEGIN LICENSE BLOCK ***** -# Version: MPL 1.1/GPL 2.0/LGPL 2.1 -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# The Original Code is the Netscape security libraries. -# -# The Initial Developer of the Original Code is -# Netscape Communications Corporation. -# Portions created by the Initial Developer are Copyright (C) 1994-2000 -# the Initial Developer. All Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 2 or later (the "GPL"), or -# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -# in which case the provisions of the GPL or the LGPL are applicable instead -# of those above. If you wish to allow use of your version of this file only -# under the terms of either the GPL or the LGPL, and not to allow others to -# use your version of this file under the terms of the MPL, indicate your -# decision by deleting the provisions above and replace them with the notice -# and other provisions required by the GPL or the LGPL. If you do not delete -# the provisions above, a recipient may use your version of this file under -# the terms of any one of the MPL, the GPL or the LGPL. -# -# ***** END LICENSE BLOCK ***** -CVS_ID "@(#) $RCSfile: certdata.txt,v $ $Revision: 1.82 $ $Date: 2012/02/18 21:41:46 $" +# 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/. +CVS_ID "@(#) $RCSfile: certdata.txt,v $ $Revision: 1.83 $ $Date: 2012/04/25 14:49:29 $" # # certdata.txt |