From: Rob Van Dam <rvandam00@gmail.com>
Date: Thu, 7 Nov 2013 22:27:24 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=df1ebf662a9fc3f89503036e0dbf6833c1b95f9e

Merge remote-tracking branch 'upstream/master'

Conflicts:
	FS/FS/cust_pkg.pm
---

df1ebf662a9fc3f89503036e0dbf6833c1b95f9e
diff --cc FS/FS/cust_pkg.pm
index eb6a714fe,771d3ec75..5abdbe2ee
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@@ -48,8 -49,13 +48,10 @@@ use FS::svc_forward
  # for sending cancel emails in sub cancel
  use FS::Conf;
  
 -$DEBUG = 0;
 -$me = '[FS::cust_pkg]';
 +our ($disable_agentcheck, $DEBUG, $me, $import) = (0, 0, '[FS::cust_pkg]', 0);
  
 -$disable_agentcheck = 0;
 -
 -$upgrade = 0; #go away after setup+start dates cleaned up for old customers
++our $upgrade = 0; #go away after setup+start dates cleaned up for old customers
+ 
  sub _cache {
    my $self = shift;
    my ( $hashref, $cache ) = @_;