Merge remote-tracking branch 'origin/new/bug_8743'
authorPaul Poulain <paul.poulain@biblibre.com>
Fri, 14 Sep 2012 14:07:36 +0000 (16:07 +0200)
committerPaul Poulain <paul.poulain@biblibre.com>
Fri, 14 Sep 2012 14:07:36 +0000 (16:07 +0200)
commit9e7a3ced9219a00bcc4d585bad088cc4d26fcf2c
tree35d5f1b499ca9817b97f28c57f4a63bd5f787430
parentcec20df6d9a863d9ee33c670970b37f62d508280
parentf22d9e1337183dfe6afe2fb014841bf17d657a11
Merge remote-tracking branch 'origin/new/bug_8743'

Conflicts:
installer/data/mysql/updatedatabase.pl