Merge branch 'master' of git.evergreen-ils.org:Evergreen into dbs/template-toolkit...

author Dan Scott <dan@coffeecode.net>

Mon, 13 Jun 2011 13:03:36 +0000 (09:03 -0400)

committer Dan Scott <dan@coffeecode.net>

Mon, 13 Jun 2011 13:03:36 +0000 (09:03 -0400)
author Dan Scott <dan@coffeecode.net>
Mon, 13 Jun 2011 13:03:36 +0000 (09:03 -0400)
committer Dan Scott <dan@coffeecode.net>
Mon, 13 Jun 2011 13:03:36 +0000 (09:03 -0400)
diff --cc Open-ILS/examples/fm_IDL.xml
Simple merge
diff --cc Open-ILS/src/perlmods/lib/OpenILS/Application/Actor.pm
Simple merge
author	Dan Scott <dan@coffeecode.net>
	Mon, 13 Jun 2011 13:03:36 +0000 (09:03 -0400)
committer	Dan Scott <dan@coffeecode.net>
	Mon, 13 Jun 2011 13:03:36 +0000 (09:03 -0400)
		1	2
Open-ILS/examples/fm_IDL.xml	patch \|	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/perlmods/lib/OpenILS/Application/Actor.pm	patch \|	diff1 \|	diff2 \|	blob \| history