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)
commit06f92269d9fe378cfa2f00c958404a6e8df642ff
tree9171a03cbd64f37b6b0c8271974f04e5042242fa
parent67065f306c08433774a1044bcd8e5d6254d752da
parent7ce77a80cf98d1b97e8bcd942d03905902b9d653
Merge branch 'master' of git.freeside.biz:/home/git/freeside

Conflicts:
httemplate/view/cust_main/packages/contact.html
FS/FS/cust_pkg.pm
httemplate/view/cust_main/packages/contact.html