From: Steve Sheppard <sheppards.email@gmail.com>
Date: Thu, 12 Aug 2010 21:37:32 +0000 (-0400)
Subject: Merge branch 'master' of http://github.com/rsoulliere/Evergreen-DocBook
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=ff85a2cfed227b13a906fa3bcad67ce3f66d50c1;p=evergreen%2Fpines.git

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

ff85a2cfed227b13a906fa3bcad67ce3f66d50c1