Merge branch 'master' of git.evergreen-ils.org:Evergreen-DocBook into doc_consolidati...
authorDan Scott <dscott@laurentian.ca>
Mon, 21 May 2012 02:35:54 +0000 (22:35 -0400)
committerDan Scott <dscott@laurentian.ca>
Mon, 21 May 2012 02:35:54 +0000 (22:35 -0400)
Conflicts:
README

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

Trivial merge