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

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

author	Mike Rylander <mrylander@gmail.com>
	Tue, 3 May 2011 15:11:02 +0000 (11:11 -0400)
committer	Mike Rylander <mrylander@gmail.com>
	Tue, 3 May 2011 15:11:02 +0000 (11:11 -0400)
commit	a949303c5a3ec991e9e6e70af937794dd6d9c7ae
tree	955b938d20e8cdaaaeca4c3356deb364c311c813	tree
parent	32a899ff1a0f6e9fed8b17fdd6c5a459b965afea	commit \| diff
parent	9ef41931a372282900834ec07ad3bfdb9daeb0d3	commit \| diff

Merge branch 'master' of git+ssh://yeti.esilibrary.com/home/evergreen/evergreen-equinox into template-toolkit-opac

Evergreen ILS