Merge remote-tracking branch 'origin/dev/stetienne' into dev/unilim unilim_maj_120118
authorJulian Maurice <julian.maurice@biblibre.com>
Wed, 18 Jan 2012 09:41:04 +0000 (10:41 +0100)
committerJulian Maurice <julian.maurice@biblibre.com>
Wed, 18 Jan 2012 09:41:04 +0000 (10:41 +0100)
commit19db6ace577607612e35c19353583dc57075f709
tree55d89c0fec6b9cd0557f573e3b327710f51a28e2
parent532dea49b635f690a0e14abda77c645258f12054
parent25b9e31b2d4833e43fb24e7447eb5bb7c38762d6
Merge remote-tracking branch 'origin/dev/stetienne' into dev/unilim

Solved conflicts:
installer/data/mysql/updatedatabase.pl
koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc
koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
kohaversion.pl
15 files changed:
C4/Auth.pm
C4/Biblio.pm
C4/Items.pm
C4/Matcher.pm
cataloguing/addbooks.pl
installer/data/mysql/kohastructure.sql
installer/data/mysql/updatedatabase.pl
koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc
koha-tmpl/opac-tmpl/prog/en/js/commons.js
koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
opac/opac-detail.pl
opac/opac-search.pl