Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Thu, 13 Nov 2014 22:28:36 +0000 (14:28 -0800)
committerIvan Kohler <ivan@freeside.biz>
Thu, 13 Nov 2014 22:28:36 +0000 (14:28 -0800)
commit52a824f9b11ca266be10c76894eaf6607344c8d0
tree18eddfb01892f51a973812255c23e4353ae202ee
parent4af695fe8521e17dd67ba34df929f35fdad4c505
parentaf501d08494e5930d53da1cb1f02e65e2a6ebd07
Merge branch 'master' of git.freeside.biz:/home/git/freeside
FS/FS/Conf.pm
FS/FS/cust_main/Status.pm