Merge remote-tracking branch 'origin/new/bug_6132'
authorPaul Poulain <paul.poulain@biblibre.com>
Mon, 16 Jan 2012 13:53:08 +0000 (14:53 +0100)
committerPaul Poulain <paul.poulain@biblibre.com>
Mon, 16 Jan 2012 13:53:08 +0000 (14:53 +0100)
1  2 
C4/Context.pm

diff --cc C4/Context.pm
Simple merge