Merge remote-tracking branch 'origin/new/bug_8523'
authorPaul Poulain <paul.poulain@biblibre.com>
Fri, 21 Sep 2012 14:37:25 +0000 (16:37 +0200)
committerPaul Poulain <paul.poulain@biblibre.com>
Fri, 21 Sep 2012 14:37:25 +0000 (16:37 +0200)
Conflicts:
kohaversion.pl


Trivial merge