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

]> git.evergreen-ils.org Git - Evergreen.git/commit

projects / Evergreen.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 25934ee 04008a5)

author	Bill Erickson <berick@esilibrary.com>
	Fri, 5 Aug 2011 18:57:03 +0000 (14:57 -0400)
committer	Bill Erickson <berick@esilibrary.com>
	Fri, 5 Aug 2011 18:57:03 +0000 (14:57 -0400)
commit	c186e123539192b23fddc6cd7683fe4a1c80c34c
tree	0a4e7cc79d0f5715bb46548804ff40c1e25e660b	tree
parent	25934ee7b5d7934ea1d6cfbc3e9365f7bd9dacd3	commit \| diff
parent	04008a5bece9c12d2e6ce48ed7ed11eb5d537289	commit \| diff

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

Open-ILS/src/sql/Pg/950.data.seed-values.sql	diff1 \|	diff2 \|	blob \| history
Open-ILS/xul/staff_client/server/patron/holds.js	diff1 \|	diff2 \|	blob \| history

Evergreen ILS