Merge remote-tracking branch 'origin/new/bug_7241'
authorPaul Poulain <paul.poulain@biblibre.com>
Mon, 3 Sep 2012 15:26:18 +0000 (17:26 +0200)
committerPaul Poulain <paul.poulain@biblibre.com>
Mon, 3 Sep 2012 15:26:18 +0000 (17:26 +0200)

Trivial merge