From: Robert Soulliere Date: Fri, 1 Oct 2010 19:56:14 +0000 (-0400) Subject: Merge branch 'master' of github.com:rsoulliere/Evergreen-DocBook X-Git-Tag: sprint4-merge-nov22~4203^2~347^2 X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=536e26c65a06ff787dce9184c4491553445633dd;p=working%2FEvergreen.git Merge branch 'master' of github.com:rsoulliere/Evergreen-DocBook --- 536e26c65a06ff787dce9184c4491553445633dd