Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Thu, 4 Dec 2014 18:37:16 +0000 (10:37 -0800)
committerIvan Kohler <ivan@freeside.biz>
Thu, 4 Dec 2014 18:37:16 +0000 (10:37 -0800)
commit8dd41f364aaba88969dfd0908feb22709025e7f6
tree471cb3796019d873da648413d88ca70a657414ed
parenta2df4ef9575be1ae2f1f5b9089f121316f796bac
parentbf50a8356a7344b4f75c7bc7f952019b98867f26
Merge branch 'master' of git.freeside.biz:/home/git/freeside
FS/FS/Template_Mixin.pm
httemplate/elements/menu.html
httemplate/misc/cancel_cust.html
httemplate/misc/suspend_cust.html