Merge remote-tracking branch 'origin/dev/stetienne' into dev/unilim unilim_maj_111109
authorClaire Hernandez <claire.hernandez@biblibre.com>
Wed, 9 Nov 2011 09:10:10 +0000 (10:10 +0100)
committerClaire Hernandez <claire.hernandez@biblibre.com>
Wed, 9 Nov 2011 09:10:10 +0000 (10:10 +0100)
commitf0d357d150fa5fe0a44b5b5482744c567f26c4e3
tree2d83aad2c038dc53d62d84486dfb6943cb3f62bc
parent593bdfdbf07569557b2563ae788a8cc94c5c488b
parentc38767e6786ec256e340d959a53b0cd132a6bc89
Merge remote-tracking branch 'origin/dev/stetienne' into dev/unilim

Conflicts solved:
installer/data/mysql/kohastructure.sql
installer/data/mysql/updatedatabase.pl
kohaversion.pl
C4/Auth.pm
installer/data/mysql/kohastructure.sql
installer/data/mysql/updatedatabase.pl
koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl