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

author	rsoulliere <robert.soulliere@mohawkcollege.ca>
	Mon, 16 May 2011 16:15:29 +0000 (12:15 -0400)
committer	rsoulliere <robert.soulliere@mohawkcollege.ca>
	Mon, 16 May 2011 16:15:29 +0000 (12:15 -0400)
commit	7cd9a824f0eadc452751af29cadaed766ae819ff
tree	21a9f1d61ab9d90ad246dff8c93b06c0450421a9	tree
parent	c193508f05ab1c6573be6339e86fbc45fe8160b2	commit \| diff
parent	6a6e1fef279d3d13450020fca14edbccef4fd7af	commit \| diff

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

Conflicts:
README