From: Robert Soulliere <rsoulliere@libdog.mohawkcollege.ca>
Date: Fri, 1 Oct 2010 19:56:14 +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=536e26c65a06ff787dce9184c4491553445633dd;p=contrib%2FConifer.git

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

536e26c65a06ff787dce9184c4491553445633dd