Merge remote-tracking branch 'origin/new/bug_7367'
authorPaul Poulain <paul.poulain@biblibre.com>
Fri, 27 Jan 2012 11:38:00 +0000 (12:38 +0100)
committerPaul Poulain <paul.poulain@biblibre.com>
Fri, 27 Jan 2012 11:38:00 +0000 (12:38 +0100)
1  2 
C4/Auth.pm

diff --cc C4/Auth.pm
Simple merge