Merge branch 'upstream'

Update to 4.4

Conflicts:
	show_bug.cgi
	template/en/default/admin/users/list.html.tmpl
	template/en/default/bug/show-header.html.tmpl
	template/en/default/email/bugmail-header.txt.tmpl
	template/en/default/email/bugmail.txt.tmpl

3 files changed, 20 insertions, 44 deletions

diff --git a/skins/contrib/Dusk/buglist.css b/skins/contrib/Dusk/buglist.css
index 2e14368b1..a9cbfd0fe 100644
--- a/skins/contrib/Dusk/buglist.css
+++ b/skins/contrib/Dusk/buglist.css
@@ -1,23 +1,10 @@
-/* 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 Bugzilla Bug Tracking System.
-  *
-  * The Initial Developer of the Original Code is Mike Schrag.
-  * Portions created by Marc Schumann are Copyright (c) 2007 Mike Schrag.
-  * All rights reserved.
-  *
-  * Contributor(s): Mike Schrag <mschrag@pobox.com>
-  *                 Byron Jones <bugzilla@glob.com.au>
-  *                 Marc Schumann <wurblzap@gmail.com>
-  */
+/* 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/.
+ *
+ * This Source Code Form is "Incompatible With Secondary Licenses", as
+ * defined by the Mozilla Public License, v. 2.0.
+ */
 
 tr.bz_bugitem:hover {
     background-color: #ccccff;
diff --git a/skins/contrib/Dusk/global.css b/skins/contrib/Dusk/global.css
index 63375672b..f051a3b58 100644
--- a/skins/contrib/Dusk/global.css
+++ b/skins/contrib/Dusk/global.css
@@ -1,24 +1,10 @@
-/* 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 Bugzilla Bug Tracking System.
-  *
-  * The Initial Developer of the Original Code is Mike Schrag.
-  * Portions created by Marc Schumann are Copyright (c) 2007 Mike Schrag.
-  * All rights reserved.
-  *
-  * Contributor(s): Mike Schrag <mschrag@pobox.com>
-  *                 Byron Jones <bugzilla@glob.com.au>
-  *                 Marc Schumann <wurblzap@gmail.com>
-  *                 Frédéric Buclin <LpSolit@gmail.com>
-  */
+/* 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/.
+ *
+ * This Source Code Form is "Incompatible With Secondary Licenses", as
+ * defined by the Mozilla Public License, v. 2.0.
+ */
 
 body {
     background: #c8c8c8;
diff --git a/skins/contrib/Dusk/index.css b/skins/contrib/Dusk/index.css
index c9c2d1705..8ea90b5ee 100644
--- a/skins/contrib/Dusk/index.css
+++ b/skins/contrib/Dusk/index.css
@@ -1,6 +1,9 @@
-/*
- * Custom rules for index.css.
- * The rules you put here override rules in that stylesheet.
+/* 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/.
+ *
+ * This Source Code Form is "Incompatible With Secondary Licenses", as
+ * defined by the Mozilla Public License, v. 2.0.
  */
     
     div#page-index .outro