Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Wed, 17 Apr 2013 16:48:09 +0000 (09:48 -0700)
committerIvan Kohler <ivan@freeside.biz>
Wed, 17 Apr 2013 16:48:09 +0000 (09:48 -0700)
Conflicts:
httemplate/view/cust_main/packages/contact.html

1  2 
FS/FS/cust_pkg.pm
httemplate/view/cust_main/packages/contact.html

Simple merge