Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Tue, 11 Sep 2012 00:26:18 +0000 (17:26 -0700)
committerIvan Kohler <ivan@freeside.biz>
Tue, 11 Sep 2012 00:26:18 +0000 (17:26 -0700)
commit2b10c0594ff2ab9ce37d9f8af9c154d3bedde731
tree0c2c760de09ca72dfc2b4eaea7f57abe3ed47de4
parent05669195e91e450449405bd3dc355e8e17f36565
parentf8c8b9782ff5400790c2fb6dae017ce01790e56e
Merge branch 'master' of git.freeside.biz:/home/git/freeside
FS/FS/Conf.pm
FS/FS/Schema.pm