Fixing merge error
authorChris Cormack <crc@liblime.com>
Mon, 29 Oct 2007 18:21:32 +0000 (13:21 -0500)
committerJoshua Ferraro <jmf@liblime.com>
Mon, 29 Oct 2007 21:12:09 +0000 (16:12 -0500)
commitbeb1baf6863ef26ddfe052e311a76fa4377ccb38
treefc9078d2a8464fc587789beb8770baee36cdc8fe
parentea899bc55933cd74e4665d70b1c48cab82cd1257
Fixing merge error

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
C4/Auth.pm