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

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

author	Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
	Mon, 18 Jul 2011 17:56:38 +0000 (13:56 -0400)
committer	Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
	Mon, 18 Jul 2011 17:56:38 +0000 (13:56 -0400)
commit	00f61c6a03b0cf1ad67713cb0705f3d5e2adf961
tree	2e2bab1478f1288f4d63abc4c45041c766a08cf1	tree
parent	777679e17299dcdcc135d493a2a9987c9357d9ff	commit \| diff
parent	8de304ac0b98147ab327954d7d2e9e5d4460a469	commit \| diff

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

Evergreen ILS