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)
commitbd1f62137de9a1b7f511bda881f4ffcc9e9d597f
tree6b74167e784b727157103c3623d16bca9ca1dc12
parent30dbc1c0a1c8b1b432181fe3d9ea9df8da6ea61a
parentb2bb0c78e5c51997262712f9f4cb83ac1f9ba39d
Merge remote-tracking branch 'origin/new/bug_8523'

Conflicts:
kohaversion.pl