Merge remote-tracking branch 'origin/new/bug_8092' origin/bug_7895 origin/bug_8221
authorPaul Poulain <paul.poulain@biblibre.com>
Thu, 14 Jun 2012 15:57:09 +0000 (17:57 +0200)
committerPaul Poulain <paul.poulain@biblibre.com>
Thu, 14 Jun 2012 15:57:09 +0000 (17:57 +0200)

Trivial merge