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

author	rsoulliere <robert.soulliere@mohawkcollege.ca>
	Tue, 17 May 2011 12:30:55 +0000 (08:30 -0400)
committer	rsoulliere <robert.soulliere@mohawkcollege.ca>
	Tue, 17 May 2011 12:30:55 +0000 (08:30 -0400)
commit	b48ef76900711198b4028c26ef2c0d99c6d5b837
tree	92bffb55bbd0e78f56c551a296818fd2da817ecc	tree
parent	0f0de211caa4c0b0bdefdb8f0466f0a628654038	commit \| diff
parent	01f1cae45e26b13819546131fd5a57181e656bbb	commit \| diff

Merge branch 'master' of git.evergreen-ils.org:Evergreen-DocBook

Conflicts:
README