Merge remote-tracking branch 'origin/new/bug_6865'
authorPaul Poulain <paul.poulain@biblibre.com>
Tue, 13 Dec 2011 15:23:38 +0000 (16:23 +0100)
committerPaul Poulain <paul.poulain@biblibre.com>
Tue, 13 Dec 2011 15:23:38 +0000 (16:23 +0100)

Trivial merge