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

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

author	Bill Erickson <berick@esilibrary.com>
	Thu, 8 Sep 2011 21:52:01 +0000 (17:52 -0400)
committer	Bill Erickson <berick@esilibrary.com>
	Thu, 8 Sep 2011 21:52:01 +0000 (17:52 -0400)
commit	7f1e214e51edc9ba0cd2beb5a6693325bdebb820
tree	4dd7b96d343343ff05d7409a0ace054e30e309fd	tree
parent	6a244e866430fe67c5ceea408c163dc2236de929	commit \| diff
parent	6d21b9431c8d73c88b8d41c874ff766c11f90746	commit \| diff

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

Evergreen ILS