From: Jason Stephenson <jstephenson@mvlc.org>
Date: Thu, 23 Jun 2011 13:09:37 +0000 (-0400)
Subject: Merge remote branch 'working/user/dbs/LP795677-z3950_server_ctl' into oils_ctl-improv... 
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=cf6f6f7d35d97395b2f79f14f8d2247203f69153;p=working%2FEvergreen.git

Merge remote branch 'working/user/dbs/LP795677-z3950_server_ctl' into oils_ctl-improvements

Conflicts:
	Open-ILS/examples/oils_z3950.xml.example

Signed-off-by: Jason Stephenson <jstephenson@mvlc.org>
---

cf6f6f7d35d97395b2f79f14f8d2247203f69153