[Koha-devel] Head & rel_2_2 merged.

Hi all, I 've just merged Head and rel_2_2 and i prepare a big commit soon. I think this merged version has no "Internal Server Error" but, as i'm new in the koha code, it's possible that i 've made some mistakes by resolving conflits between these 2 versions... I hope i haven't made too much errors and/or bugs ! Cheers, -- Antone Farnault antoine@koha-fr.org