From: Steve Sheppard <ssheps@gmail.com>
Date: Thu, 30 Sep 2010 19:01:10 +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=6a008f32bf8d74295a7880c93b07b748365ee605;p=contrib%2FConifer.git

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

Conflicts:
	1.6/admin/ServersideInstallationVirtual.xml
---

6a008f32bf8d74295a7880c93b07b748365ee605