Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Sat, 16 May 2015 23:08:31 +0000 (16:08 -0700)
committerIvan Kohler <ivan@freeside.biz>
Sat, 16 May 2015 23:08:31 +0000 (16:08 -0700)
1  2 
httemplate/elements/freeside.css
httemplate/view/cust_main/billing.html

Simple merge