From: Ivan Kohler <ivan@freeside.biz>
Date: Sun, 11 Aug 2013 23:18:24 +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=35e5b12fb55f229edd16bed66e21c5806b8d3b7e;hp=98ea745e4b55a38ad8b5ba3749c56327d641d65d

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

diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index 0ecc0ffcb..89c683e17 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -1450,10 +1450,8 @@ field).
 
 Can be set true to adjust the next bill date forward by
 the amount of time the account was inactive.  This was set true by default
-since 1.4.2 and 1.5.0pre6; however, starting with 1.7.0 this needs to be
-explicitly requested.  Price plans for which this makes sense (anniversary-date
-based than prorate or subscription) could have an option to enable this
-behaviour?
+in the past (from 1.4.2 and 1.5.0pre6 through 1.7.0), but now needs to be
+explicitly requested with this option or in the price plan.
 
 =back