projects / working / Evergreen.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0f2334c 9f536b8)
Merge remote branch 'working/user/dbs/LP795677-z3950_server_ctl' into oils_ctl-improv...
authorJason Stephenson <jstephenson@mvlc.org>
Thu, 23 Jun 2011 13:09:37 +0000 (09:09 -0400)
committerJason Stephenson <jstephenson@mvlc.org>
Thu, 23 Jun 2011 13:09:37 +0000 (09:09 -0400)
commitcf6f6f7d35d97395b2f79f14f8d2247203f69153
tree6134c7301af6c09b3bb8f053c1617a8de7a35a5ftree
parent0f2334ce68a9bfb446bf9b1b6334cd7761cb5ccacommit | diff
parent9f536b8c3bed1e9e939c9fe9905a69cbe8a53b25commit | diff
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>
Evergreen ILS