From: Hilary Caws-Elwitt Date: Thu, 19 May 2011 18:40:35 +0000 (-0400) Subject: Merge branch 'master' of git@github.com:hcethatsme/Evergreen-DocBook.git X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=7952424704ce9d34a0a2dcbf2aed2706acae350f;p=contrib%2FConifer.git Merge branch 'master' of git@github.com:hcethatsme/Evergreen-DocBook.git --- 7952424704ce9d34a0a2dcbf2aed2706acae350f