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

author Ivan Kohler <ivan@freeside.biz>

Thu, 26 Jul 2012 21:05:08 +0000 (14:05 -0700)

committer Ivan Kohler <ivan@freeside.biz>

Thu, 26 Jul 2012 21:05:08 +0000 (14:05 -0700)
author Ivan Kohler <ivan@freeside.biz>
Thu, 26 Jul 2012 21:05:08 +0000 (14:05 -0700)
committer Ivan Kohler <ivan@freeside.biz>
Thu, 26 Jul 2012 21:05:08 +0000 (14:05 -0700)
diff --cc FS/FS/Conf.pm
Simple merge
diff --cc FS/FS/Schema.pm
Simple merge
diff --cc FS/FS/cust_main.pm
Simple merge
diff --cc httemplate/misc/order_pkg.html
Simple merge
author	Ivan Kohler <ivan@freeside.biz>
	Thu, 26 Jul 2012 21:05:08 +0000 (14:05 -0700)
committer	Ivan Kohler <ivan@freeside.biz>
	Thu, 26 Jul 2012 21:05:08 +0000 (14:05 -0700)
		1	2
FS/FS/Conf.pm	patch \|	diff1 \|	diff2 \|	blob \| history
FS/FS/Schema.pm	patch \|	diff1 \|	diff2 \|	blob \| history
FS/FS/cust_main.pm	patch \|	diff1 \|	diff2 \|	blob \| history
httemplate/misc/order_pkg.html	patch \|	diff1 \|	diff2 \|	blob \| history