Merge remote-tracking branch 'origin/new/bug_8315'
authorPaul Poulain <paul.poulain@biblibre.com>
Fri, 13 Jul 2012 12:17:59 +0000 (14:17 +0200)
committerPaul Poulain <paul.poulain@biblibre.com>
Fri, 13 Jul 2012 12:17:59 +0000 (14:17 +0200)

Trivial merge