Merge branch 'master' of git.freeside.biz:/home/git/freeside

author Ivan Kohler <ivan@freeside.biz>

Thu, 4 Dec 2014 18:37:16 +0000 (10:37 -0800)

committer Ivan Kohler <ivan@freeside.biz>

Thu, 4 Dec 2014 18:37:16 +0000 (10:37 -0800)
author Ivan Kohler <ivan@freeside.biz>
Thu, 4 Dec 2014 18:37:16 +0000 (10:37 -0800)
committer Ivan Kohler <ivan@freeside.biz>
Thu, 4 Dec 2014 18:37:16 +0000 (10:37 -0800)
diff --cc FS/FS/Template_Mixin.pm
Simple merge
diff --cc httemplate/elements/menu.html
Simple merge
diff --cc httemplate/misc/cancel_cust.html
Simple merge
diff --cc httemplate/misc/suspend_cust.html
Simple merge
author	Ivan Kohler <ivan@freeside.biz>
	Thu, 4 Dec 2014 18:37:16 +0000 (10:37 -0800)
committer	Ivan Kohler <ivan@freeside.biz>
	Thu, 4 Dec 2014 18:37:16 +0000 (10:37 -0800)
		1	2
FS/FS/Template_Mixin.pm	patch \|	diff1 \|	diff2 \|	blob \| history
httemplate/elements/menu.html	patch \|	diff1 \|	diff2 \|	blob \| history
httemplate/misc/cancel_cust.html	patch \|	diff1 \|	diff2 \|	blob \| history
httemplate/misc/suspend_cust.html	patch \|	diff1 \|	diff2 \|	blob \| history