Merge branch 'master' of git+ssh://yeti.esilibrary.com/home/evergreen/evergreen-equin...

author Mike Rylander <mrylander@gmail.com>

Fri, 22 Apr 2011 14:59:07 +0000 (10:59 -0400)

committer Mike Rylander <mrylander@gmail.com>

Fri, 22 Apr 2011 14:59:07 +0000 (10:59 -0400)
author Mike Rylander <mrylander@gmail.com>
Fri, 22 Apr 2011 14:59:07 +0000 (10:59 -0400)
committer Mike Rylander <mrylander@gmail.com>
Fri, 22 Apr 2011 14:59:07 +0000 (10:59 -0400)
diff --cc Open-ILS/examples/fm_IDL.xml
Simple merge
diff --cc Open-ILS/xul/staff_client/chrome/content/main/menu.js
Simple merge
author	Mike Rylander <mrylander@gmail.com>
	Fri, 22 Apr 2011 14:59:07 +0000 (10:59 -0400)
committer	Mike Rylander <mrylander@gmail.com>
	Fri, 22 Apr 2011 14:59:07 +0000 (10:59 -0400)
		1	2
Open-ILS/examples/fm_IDL.xml	patch \|	diff1 \|	diff2 \|	blob \| history
Open-ILS/xul/staff_client/chrome/content/main/menu.js	patch \|	diff1 \|	diff2 \|	blob \| history