Merge commit 'kc/master'
authorChris Cormack <chrisc@catalyst.net.nz>
Sun, 13 Jun 2010 21:15:00 +0000 (09:15 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Sun, 13 Jun 2010 21:15:00 +0000 (09:15 +1200)
1  2 
C4/Auth.pm

diff --cc C4/Auth.pm
Simple merge