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

diff --combined Makefile
index e18d39d,a1e4566..3486b79
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -117,7 -117,7 +117,7 @@@ FREESIDE_URL = "http://localhost/freesi
  #for now, same db as specified in DATASOURCE... eventually, otherwise?
  RT_DB_DATABASE = freeside
  
 -TORRUS_ENABLED = 1
 +#TORRUS_ENABLED = 1
  
  # for auto-version updates, so we can "make release" more things automatically
  RPM_SPECFILE = rpm/freeside.spec
@@@ -236,7 -236,7 +236,7 @@@ perl-modules
        " blib/lib/FS/part_export/*.pm;\
        perl -p -i -e "\
          s|%%%FREESIDE_CACHE%%%|${FREESIDE_CACHE}|g;\
-       " blib/lib/FS/cust_main/*.pm blib/lib/FS/cust_pkg/*.pm;\
+       " blib/lib/FS/cust_main/*.pm blib/lib/FS/cust_pkg/*.pm blib/lib/FS/contact/*.pm;\
        perl -p -i -e "\
          s|%%%FREESIDE_LOG%%%|${FREESIDE_LOG}|g;\
        " blib/lib/FS/Daemon/*.pm;\