[freeside-commits] branch FREESIDE_3_BRANCH updated. 1c67869e4a2bb33d2375ba4cf14272d0bfb1575f

[Christopher Burger]

The branch, FREESIDE_3_BRANCH has been updated
       via  1c67869e4a2bb33d2375ba4cf14272d0bfb1575f (commit)
       via  047630eac61dcf23b14e70b3d0004990a2b3718c (commit)
      from  41a4c4b426f82359f91679b3051d689c93314ea4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1c67869e4a2bb33d2375ba4cf14272d0bfb1575f
Merge: 047630e 41a4c4b
Author: Christopher Burger <burgerc at freeside.biz>
Date:   Fri Sep 8 13:28:32 2017 -0400

    Merge branch 'FREESIDE_3_BRANCH' of freeside.biz:/home/git/freeside into FREESIDE_3_BRANCH


commit 047630eac61dcf23b14e70b3d0004990a2b3718c
Author: Christopher Burger <burgerc at freeside.biz>
Date:   Fri Sep 8 13:23:26 2017 -0400

    RT# 77167 - removed change to Mason.pm as not needed.

diff --git a/FS/FS/Mason.pm b/FS/FS/Mason.pm
index f50192c..60e3779 100644
--- a/FS/FS/Mason.pm
+++ b/FS/FS/Mason.pm
@@ -266,7 +266,6 @@ if ( -e $addl_handler_use_file ) {
   use FS::cust_category;
   use FS::prospect_main;
   use FS::contact;
-  use FS::contact::Import;
   use FS::phone_type;
   use FS::svc_pbx;
   use FS::discount;

-----------------------------------------------------------------------

Summary of changes: