Merge remote-tracking branch 'kc/new/bug_5995' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Fri, 14 Oct 2011 23:59:34 +0000 (12:59 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Fri, 14 Oct 2011 23:59:34 +0000 (12:59 +1300)
commita118102d4e2d7cf6bc1157a560c52fd6deb6f7a7
tree16c37023c61f6f48d5aa9f4d65f365a72f8b03cd
parentd139d400b11e76f19ed208d4898d57f678acf9f4
parentdcb4ac77fbfd813cc0eb39e060b49a7b8d491016
Merge remote-tracking branch 'kc/new/bug_5995' into kcmaster
C4/Auth.pm
C4/Auth_with_ldap.pm