Merge remote-tracking branch 'eg-working/user/berick/hold-current-shelf-lib'

author Mike Rylander <mrylander@gmail.com>

Mon, 9 Jan 2012 18:44:16 +0000 (13:44 -0500)

committer Mike Rylander <mrylander@gmail.com>

Mon, 9 Jan 2012 18:44:45 +0000 (13:44 -0500)
author Mike Rylander <mrylander@gmail.com>
Mon, 9 Jan 2012 18:44:16 +0000 (13:44 -0500)
committer Mike Rylander <mrylander@gmail.com>
Mon, 9 Jan 2012 18:44:45 +0000 (13:44 -0500)
diff --cc Open-ILS/examples/fm_IDL.xml
Simple merge
diff --cc Open-ILS/src/sql/Pg/090.schema.action.sql
Simple merge
author	Mike Rylander <mrylander@gmail.com>
	Mon, 9 Jan 2012 18:44:16 +0000 (13:44 -0500)
committer	Mike Rylander <mrylander@gmail.com>
	Mon, 9 Jan 2012 18:44:45 +0000 (13:44 -0500)
		1	2
Open-ILS/examples/fm_IDL.xml	patch \|	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/sql/Pg/090.schema.action.sql	patch \|	diff1 \|	diff2 \|	blob \| history