[Koha-devel] merging 1.2 and main branches...

[paul POULAIN]

IT'S DONE !!!!
Except for a few scripts, which needs to be rewritten in the future, or 
don't need to be merged, everything is done...

It was trully a NIGHTMARE ;-) (and i'm not sure i made no mistakes ;-\\\\ )

I remind everybody the rules :
* rel-1-2 is done only for BUGFIXES. If you make a bugfix, check it in 
the main trunk too please.
* If you plan to implement a new feature, do it in the MAIN trunk. If we 
decide to provide the functionnality in a 1.2.x release, we will merge 
from the trunk to rel-1-2.

PLEEAAASSSEEEE Use those rules. The 1st who don't will be nominated as 
merging-programmer for the next big merge !!!!

Thanks for your attention.

Let's go to MARC stuff now for me ;-)
--
Paul