Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Wed, 11 Dec 2013 04:59:42 +0000 (20:59 -0800)
committerIvan Kohler <ivan@freeside.biz>
Wed, 11 Dec 2013 04:59:42 +0000 (20:59 -0800)
commit430b2c784d2ee9ea5be00b821d2dbd27279ef132
treec8a224219c1425bd3fa03b1a54487bf1f3de7449
parent6ced51db0e73603461591e54b7f606467e7c7af0
parente1157f37c618a7b9cdb2793d61999458076dc51b
Merge branch 'master' of git.freeside.biz:/home/git/freeside

Conflicts:
FS/FS/Mason.pm
FS/MANIFEST
FS/FS/ClientAPI/MyAccount.pm
FS/FS/Conf.pm
FS/FS/Mason.pm
FS/FS/part_export/bulkvs_e911.pm
FS/MANIFEST
FS/bin/freeside-setup
bin/cust_pkg-restore_setup
fs_selfservice/php/freeside_signup_example.php
httemplate/edit/cust_main/billing.html