From 7ee1d0060c3184921710f471ff0959c7638d856c Mon Sep 17 00:00:00 2001
From: Byron Jones <bjones@mozilla.com>
Date: Tue, 4 Sep 2012 00:20:58 +0800
Subject: revert accidential commits

---
 .htaccess   | 1 -
 Bugzilla.pm | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.htaccess b/.htaccess
index 02b7411dd..4b4fc6d78 100644
--- a/.htaccess
+++ b/.htaccess
@@ -33,7 +33,6 @@ Redirect permanent /etiquette.html https://bugzilla.mozilla.org/page.cgi?id=etiq
 Redirect permanent /duplicates.html https://bugzilla.mozilla.org/duplicates.cgi
 
 RewriteEngine On
-RewriteBase /4.2-bmo/
 RewriteRule ^favicon\.ico$ extensions/BMO/web/images/favicon.ico
 RewriteRule ^form[\.:](itrequest|mozlist|mktgevent|poweredby|presentation|swag|trademark|recoverykey)$ enter_bug.cgi?product=mozilla.org&format=$1
 RewriteRule ^form[\.:]legal$ enter_bug.cgi?product=Legal&format=legal
diff --git a/Bugzilla.pm b/Bugzilla.pm
index 07026b4f1..b56f42ec4 100644
--- a/Bugzilla.pm
+++ b/Bugzilla.pm
@@ -87,7 +87,7 @@ use constant SHUTDOWNHTML_RETRY_AFTER => 3600;
 # Global Code
 #####################################################################
 
-$::SIG{__DIE__} = i_am_cgi() ? \&CGI::Carp::confess : \&Carp::confess;
+# $::SIG{__DIE__} = i_am_cgi() ? \&CGI::Carp::confess : \&Carp::confess;
 
 # Note that this is a raw subroutine, not a method, so $class isn't available.
 sub init_page {
-- 
cgit v1.2.3-24-g4f1b