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

author	rsoulliere <robert.soulliere@mohawkcollege.ca>
	Sat, 14 May 2011 21:56:12 +0000 (17:56 -0400)
committer	rsoulliere <robert.soulliere@mohawkcollege.ca>
	Sat, 14 May 2011 21:56:12 +0000 (17:56 -0400)
commit	708bc148d1a7d798fc757bb3b917cb8ee058690b
tree	0458639c8c333c2bb7f073c712174b8542e625e4	tree
parent	bab7a49f9643b798fd0c15a2c463a507479e43e0	commit \| diff
parent	d4b0a79b9d915d7aa5782b06835a593aa68e0d18	commit \| diff

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

Conflicts:
README