[Koha-devel] HEAD branch synchronised with rel_2_0

[paul POULAIN]

Hi,
the HEAD branch and rel_2_0 are synchronized.

What I did :
* cvs checkout -j rel_2_0 -P koha
* conflict resolving (80% were just $id conflicts, other were "true" 
diffs, the rel_2_0 version being usually the right one -as z3950 server 
is almost the only thing added in HEAD branch)
* commit of all scripts that needed to be.

So : feel free to play with HEAD branch by beginning new nice features :-)

-- 
Paul POULAIN
Consultant indépendant en logiciels libres
responsable francophone de koha (SIGB libre http://www.koha-fr.org)