1 files changed, 22 insertions, 9 deletions
diff --git a/scripts/merge-users.pl b/scripts/merge-users.pl
index d2b8196b5..ebe68a6a8 100755
--- a/scripts/merge-users.pl
+++ b/scripts/merge-users.pl
@@ -1,14 +1,27 @@
-#!/usr/bin/perl -T
-# 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/.
+#!/usr/bin/perl -wT
+# -*- Mode: perl; indent-tabs-mode: nil -*-
 #
-# This Source Code Form is "Incompatible With Secondary Licenses", as
-# defined by the Mozilla Public License, v. 2.0.
+# 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 Netscape Communications
+# Corporation. Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): Myk Melez <myk@mozilla.org>
+#                 Frédéric Buclin <LpSolit@gmail.com>
 
-use 5.10.1;
 use strict;
-use warnings;
 
 =head1 NAME
 
@@ -31,7 +44,7 @@ merge-users.pl - Merge two user accounts.
 
 =cut
 
-use lib qw(. lib local/lib/perl5);
+use lib qw(. lib);
 
 use Bugzilla;
 use Bugzilla::Constants;