From: Steve Sheppard Date: Wed, 15 Sep 2010 15:49:43 +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=1dd420d7adf72d801cc11a24be58dcc48dda3c69;p=contrib%2FConifer.git Merge branch 'master' of github.com:rsoulliere/Evergreen-DocBook --- 1dd420d7adf72d801cc11a24be58dcc48dda3c69