Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Sat, 26 Dec 2015 20:30:18 +0000 (12:30 -0800)
committerIvan Kohler <ivan@freeside.biz>
Sat, 26 Dec 2015 20:30:18 +0000 (12:30 -0800)
commitdd003d59f56742f9374cec309ad81d527e88c846
treefa890d0a64c6713e29674deff8d0fae6560ca644
parent2040b70c10db3390b26777bc584d54333534419d
parent7ec6e27220e3fe82405c911a4c52b24070438328
Merge branch 'master' of git.freeside.biz:/home/git/freeside
FS/FS/Conf.pm