From: Robert Soulliere <rsoulliere@libdog.mohawkcollege.ca>
Date: Fri, 6 Aug 2010 01:23:30 +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=dcb438e316c8f03f160f461b62e644bd050ecdeb;p=contrib%2FConifer.git

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

dcb438e316c8f03f160f461b62e644bd050ecdeb