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

diff --combined FS/MANIFEST
index 10f0cc2,4c892ec..81087de
--- 1/FS/MANIFEST
--- 2/FS/MANIFEST
+++ b/FS/MANIFEST
@@@ -510,6 -510,7 +510,7 @@@ t/class_Common.
  FS/category_Common.pm
  t/category_Common.t
  FS/contact.pm
+ FS/contact/Import.pm
  t/contact.t
  FS/contact_phone.pm
  t/contact_phone.t
@@@ -872,7 -873,3 +873,7 @@@ FS/saved_search.p
  t/saved_search.t
  FS/sector_coverage.pm
  t/sector_coverage.t
 +FS/access_user_session_log.pm
 +t/access_user_session_log.t
 +FS/access_user_session_log.pm
 +t/access_user_session_log.t