From: Ivan Kohler <ivan@freeside.biz>
Date: Wed, 20 Jul 2016 20:02:15 +0000 (-0700)
Subject: Merge branch 'master' of git.freeside.biz:/home/git/freeside
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=c22d84e565ab16db142395dce2e8621624eff140;hp=-c

Merge branch 'master' of git.freeside.biz:/home/git/freeside
---

c22d84e565ab16db142395dce2e8621624eff140
diff --combined FS/FS/Mason.pm
index 847f18bcd,d625fbd53..0257b045a
--- a/FS/FS/Mason.pm
+++ b/FS/FS/Mason.pm
@@@ -91,7 -91,7 +91,7 @@@ if ( -e $addl_handler_use_file ) 
    use Excel::Writer::XLSX;
    #use Excel::Writer::XLSX::Utility; #redundant with above
  
 -  use Business::CreditCard 0.30; #for mask-aware cardtype()
 +  use Business::CreditCard 0.35; #for new mastercard ranges and visa lengths
    use NetAddr::IP;
    use Net::MAC::Vendor;
    use Net::Ping;
@@@ -412,6 -412,7 +412,7 @@@
    use FS::fiber_olt;
    use FS::olt_site;
    use FS::access_user_page_pref;
+   use FS::part_svc_msgcat;
    # Sammath Naur
  
    if ( $FS::Mason::addl_handler_use ) {
@@@ -678,7 -679,7 +679,7 @@@ the same "random" numbers
  
  Works around a Net::SSLeay connection error by creating and deleting an SSL
  context, so subsequent connections do not error out with a CTX_new (900 NET OR
 -SSL ERROR).
 +SSL ERROR).  See http://bugs.debian.org/830152
  
  =cut