From: Dan Scott <dscott@laurentian.ca>
Date: Sat, 14 Jul 2012 03:19:09 +0000 (-0400)
Subject: Merge remote-tracking branch 'docbook/master' into docs_merge
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=2ed40844755f81d399e0f5ae855e20906aa8fdc1;p=evergreen%2Ftadl.git

Merge remote-tracking branch 'docbook/master' into docs_merge

Conflicts:
	README

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

2ed40844755f81d399e0f5ae855e20906aa8fdc1