Merge branch 'FREESIDE_2_3_BRANCH' of git.freeside.biz:/home/git/freeside into FREESI...

author Ivan Kohler <ivan@freeside.biz>

Wed, 4 Apr 2012 22:41:26 +0000 (15:41 -0700)

committer Ivan Kohler <ivan@freeside.biz>

Wed, 4 Apr 2012 22:41:26 +0000 (15:41 -0700)
author Ivan Kohler <ivan@freeside.biz>
Wed, 4 Apr 2012 22:41:26 +0000 (15:41 -0700)
committer Ivan Kohler <ivan@freeside.biz>
Wed, 4 Apr 2012 22:41:26 +0000 (15:41 -0700)
diff --cc FS/FS/AccessRight.pm
Simple merge
diff --cc httemplate/elements/menu.html
Simple merge
author	Ivan Kohler <ivan@freeside.biz>
	Wed, 4 Apr 2012 22:41:26 +0000 (15:41 -0700)
committer	Ivan Kohler <ivan@freeside.biz>
	Wed, 4 Apr 2012 22:41:26 +0000 (15:41 -0700)
		1	2
FS/FS/AccessRight.pm	patch \|	diff1 \|	diff2 \|	blob \| history
httemplate/elements/menu.html	patch \|	diff1 \|	diff2 \|	blob \| history