Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Sat, 9 Nov 2013 20:03:52 +0000 (12:03 -0800)
committerIvan Kohler <ivan@freeside.biz>
Sat, 9 Nov 2013 20:03:52 +0000 (12:03 -0800)
commit0c04fc78f66d17a5736686757cd8f838715c8380
tree582834c1115e6e28c78974a4cd336bed89d23cd9
parent9545a93c2cb4ee76c4226e0eacf9a6fb9c169adf
parentb668e94b7ed814217c9e4a9cfec6ed4df98e023a
Merge branch 'master' of git.freeside.biz:/home/git/freeside
FS/FS/Conf.pm