Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Mon, 9 Jul 2012 05:45:58 +0000 (22:45 -0700)
committerIvan Kohler <ivan@freeside.biz>
Mon, 9 Jul 2012 05:45:58 +0000 (22:45 -0700)
commita6fe07e49e3fc12169e801b1ed6874c3a5bd8500
treeb87a7e6f37da5c8e13eb4d4653cfc8ce9239d8f0
parente27244386c346f459d1569db26344407a0372a05
parent005424d0c899aa899f43f583a6c74deb13ea4be1
Merge branch 'master' of git.freeside.biz:/home/git/freeside

Conflicts:
httemplate/misc/process/cancel_pkg.html
FS/FS/cust_main/Billing.pm
FS/FS/cust_main/Packages.pm
FS/FS/cust_pkg.pm
FS/FS/domain_record.pm
bin/23commit
fs_selfservice/FS-SelfService/cgi/myaccount.html
fs_selfservice/FS-SelfService/cgi/provision_list.html
httemplate/edit/radius_group.html
httemplate/misc/cancel_pkg.html
httemplate/misc/process/cancel_pkg.html
httemplate/view/cust_main/packages/status.html