Merge remote-tracking branch 'origin/new/bug_7215'
authorPaul Poulain <paul.poulain@biblibre.com>
Tue, 13 Dec 2011 13:29:04 +0000 (14:29 +0100)
committerPaul Poulain <paul.poulain@biblibre.com>
Tue, 13 Dec 2011 13:29:04 +0000 (14:29 +0100)

Trivial merge