projects
/
working
/
Evergreen.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0f2334c
9f536b8
)
Merge remote branch 'working/user/dbs/LP795677-z3950_server_ctl' into oils_ctl-improv...
author
Jason Stephenson
<jstephenson@mvlc.org>
Thu, 23 Jun 2011 13:09:37 +0000
(09:09 -0400)
committer
Jason Stephenson
<jstephenson@mvlc.org>
Thu, 23 Jun 2011 13:09:37 +0000
(09:09 -0400)
Conflicts:
Open-ILS/examples/oils_z3950.xml.example
Signed-off-by: Jason Stephenson <jstephenson@mvlc.org>
Trivial merge
projects / working / Evergreen.git / commitdiff