Merge remote-tracking branch 'origin/dev/solr' into dev/limoges limoges_maj_130701
authorFridolyn SOMERS <fridolyn.somers@biblibre.com>
Fri, 28 Jun 2013 13:10:16 +0000 (15:10 +0200)
committerFridolyn SOMERS <fridolyn.somers@biblibre.com>
Fri, 28 Jun 2013 13:10:16 +0000 (15:10 +0200)
commite8c07046424e8d4862ef59e2c2c5e955cb392711
tree0bd8c9b3e1c338cd2ffcb099b9db705b0964708e
parentff05a6da3f502eea2de31997bd5f4d4835bad9eb
parent1cda31253cac5736a8230073aa9e3e336d387639
Merge remote-tracking branch 'origin/dev/solr' into dev/limoges

Conflicts:
koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl