Merge remote-tracking branch 'origin/new/bug_8525'
authorPaul Poulain <paul.poulain@biblibre.com>
Fri, 19 Oct 2012 16:03:36 +0000 (18:03 +0200)
committerPaul Poulain <paul.poulain@biblibre.com>
Fri, 19 Oct 2012 16:03:36 +0000 (18:03 +0200)
commitee3eee451d2c36ff58f9443c86a8522ef905eca1
treed56766e616ef578b7ad479e0704582431e744f7b
parent8a53d284907bbbe9d3ee2552e964af9f5dfbd0ac
parent15711398399fadc519914de9394d65238c31f78c
Merge remote-tracking branch 'origin/new/bug_8525'
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref