Bug 680131: Replace the MPL 1.1 license by the MPL 2.0 one in all files, and add it to files which miss one

r=kiko r=mkanat r=mrbball a=LpSolit

1 files changed, 6 insertions, 17 deletions

diff --git a/template/en/default/email/bugmail-common.txt.tmpl b/template/en/default/email/bugmail-common.txt.tmpl
index b6cadaf11..2b56c68af 100644
--- a/template/en/default/email/bugmail-common.txt.tmpl
+++ b/template/en/default/email/bugmail-common.txt.tmpl
@@ -1,20 +1,9 @@
-[%# 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/
+[%# 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/.
   #
-  # 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 Bugzilla Bug Tracking System.
-  #
-  # The Initial Developer of the Original Code is Guy Pyrzak
-  # Portions created by the Initial Developer are Copyright (C) 2010 the
-  # Initial Developer. All Rights Reserved.
-  #
-  # Contributor(s): Guy Pyrzak <guy.pyrzak@gmail.com>
+  # This Source Code Form is "Incompatible With Secondary Licenses", as
+  # defined by the Mozilla Public License, v. 2.0.
   #%]
   
 [% PROCESS "global/field-descs.none.tmpl" %]
@@ -35,4 +24,4 @@
 [% IF change.field_name == 'longdescs.isprivate' %]
   [% field_label = field_label.replace('^(Comment )?', "Comment #${change.num} ") %]
 [% END %]
-  
\ No newline at end of file
+