From: Robert Soulliere <rsoulliere@libdog.mohawkcollege.ca>
Date: Mon, 13 Sep 2010 18:54:34 +0000 (-0400)
Subject: Merge branch 'master' of github.com:rsoulliere/Evergreen-DocBook
X-Git-Tag: sprint4-merge-nov22~4203^2~387
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=6612fad39dadbe70bf210692fea44d89642704f2;p=working%2FEvergreen.git

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

6612fad39dadbe70bf210692fea44d89642704f2