merging 1.2 and main. Diffs are due to new features.
[koha_gimpoz] / maint /
drwxr-xr-x   ..
-rwxr-xr-x 4159 catmaintain.pl
-rwxr-xr-x 1343 shiftbib.pl