Merge branch 'bug_9102' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 1 Feb 2013 15:50:27 +0000 (10:50 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 1 Feb 2013 15:50:27 +0000 (10:50 -0500)
1  2 
C4/Auth.pm

diff --cc C4/Auth.pm
Simple merge