Merge remote-tracking branch 'origin/dev/solr' into dev/stetienne stetienne_maj_120118
authorJulian Maurice <julian.maurice@biblibre.com>
Wed, 18 Jan 2012 08:38:51 +0000 (09:38 +0100)
committerJulian Maurice <julian.maurice@biblibre.com>
Wed, 18 Jan 2012 08:38:51 +0000 (09:38 +0100)
commit25b9e31b2d4833e43fb24e7447eb5bb7c38762d6
treef266d976f5799734ed20e53b8da9a277b33aa79a
parenta1de7c0b0cf5c1078db72cb40f3bd7334bf08375
parent9bd212bd88a6ccc42e91a87f8c38cf7de58958bb
Merge remote-tracking branch 'origin/dev/solr' into dev/stetienne

Solved conflicts:
acqui/neworderbiblio.pl
installer/data/mysql/updatedatabase.pl
kohaversion.pl
16 files changed:
C4/Auth.pm
C4/Biblio.pm
C4/Items.pm
C4/Search.pm
C4/Serials.pm
authorities/authorities-home.pl
catalogue/search.pl
circ/returns.pl
installer/data/mysql/kohastructure.sql
installer/data/mysql/updatedatabase.pl
koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
opac/opac-authorities-home.pl
opac/opac-detail.pl
opac/opac-search.pl