Merge remote-tracking branch 'catalyst/merged_5549' into new/bug_5549
authorPaul Poulain <paul.poulain@biblibre.com>
Thu, 22 Mar 2012 16:34:26 +0000 (17:34 +0100)
committerPaul Poulain <paul.poulain@biblibre.com>
Thu, 22 Mar 2012 16:34:26 +0000 (17:34 +0100)
commitd5542514d22ca5b9fc6bfb4fb8b6db61e3a512b5
tree257fe2a0552a7845e05cdfdf0f912c32c915e83e
parent31175cbdabee5fb56a4403081a305da8925bcbde
parentb82a10b3422b84e6a684621fb6fdda6c7a0563eb
Merge remote-tracking branch 'catalyst/merged_5549' into new/bug_5549

Conflicts:
installer/data/mysql/updatedatabase.pl
members/moremember.pl
installer/data/mysql/kohastructure.sql
installer/data/mysql/updatedatabase.pl
koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
members/moremember.pl