From: Robert Soulliere <rsoulliere@libdog.mohawkcollege.ca>
Date: Tue, 7 Sep 2010 16:30:20 +0000 (-0400)
Subject: Merge branch 'master' of github.com:rsoulliere/Evergreen-DocBook
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=02326cbdd19ccc02c97cf9e0f0c7e973abea627f;p=contrib%2FConifer.git

Merge branch 'master' of github.com:rsoulliere/Evergreen-DocBook
---

02326cbdd19ccc02c97cf9e0f0c7e973abea627f