From: Dan Scott <dscott@laurentian.ca>
Date: Mon, 21 May 2012 02:35:54 +0000 (-0400)
Subject: Merge branch 'master' of git.evergreen-ils.org:Evergreen-DocBook into doc_consolidati... 
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=64daed36a684bb1e7e833ba6e23e67e653593c86;p=evergreen%2Fjoelewis.git

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

Conflicts:
	README

Signed-off-by: Dan Scott <dscott@laurentian.ca>
---

64daed36a684bb1e7e833ba6e23e67e653593c86