Merge remote-tracking branch 'origin/dev/solr' into dev/stetienne stetienne_maj_110831
authorClaire Hernandez <claire.hernandez@biblibre.com>
Wed, 31 Aug 2011 08:51:10 +0000 (10:51 +0200)
committerClaire Hernandez <claire.hernandez@biblibre.com>
Wed, 31 Aug 2011 08:51:10 +0000 (10:51 +0200)
commit02230d7f9f424d61b8482f5d8fd157f6be740362
tree50b8c7604f5c63b747984492af83c51c5bde2627
parentc6e3c515a8fd8706c4bc3d0eaef5a2a7e60d325c
parentfab1c1d11bff6b13359cdb5659682d78ddeffef3
Merge remote-tracking branch 'origin/dev/solr' into dev/stetienne
C4/Members.pm
catalogue/search.pl
koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
opac/opac-search.pl