Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Thu, 26 Jul 2012 21:05:08 +0000 (14:05 -0700)
committerIvan Kohler <ivan@freeside.biz>
Thu, 26 Jul 2012 21:05:08 +0000 (14:05 -0700)
commit8c450aab9bae89373c2c1b35c85597bb52299de3
tree62e7400162703ad0990f80a2d71b90fc1167e759
parent2528cc7b182781a82844d8bbb1b555560487abc7
parentbd647f16de5352722baed016b45baa4e7c695278
Merge branch 'master' of git.freeside.biz:/home/git/freeside
FS/FS/Conf.pm
FS/FS/Schema.pm
FS/FS/cust_main.pm
httemplate/misc/order_pkg.html