old-git.evergreen-ils.org Git - working/Evergreen.git/commit

projects / working / Evergreen.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 00b6701 fd5785c)

author	Bill Erickson <berick@esilibrary.com>
	Tue, 19 Feb 2013 21:28:15 +0000 (16:28 -0500)
committer	Bill Erickson <berick@esilibrary.com>
	Tue, 19 Feb 2013 21:28:15 +0000 (16:28 -0500)
commit	2f4ba88102f4a2975b2d3e56d6f78d2bd0011fd2
tree	bcb3dce43a79e1d1654457a9877d94edaffb1efe	tree
parent	00b6701d08d409ee0e8e9c3b8e6eca5959b78800	commit \| diff
parent	fd5785cb9c65e10e775bd10088c0dbc29afd977f	commit \| diff

Merge branch 'master' of git.evergreen-ils.org:Evergreen into collab/berick/z39-batch-fetch-overlay

Conflicts:
Open-ILS/src/sql/Pg/950.data.seed-values.sql

Signed-off-by: Bill Erickson <berick@esilibrary.com>

Open-ILS/examples/fm_IDL.xml	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/sql/Pg/950.data.seed-values.sql	diff1 \|	diff2 \|	blob \| history

Evergreen ILS