Merge remote branch 'kc/master' into new/enh/bug_5917
authorChris Cormack <chrisc@catalyst.net.nz>
Fri, 8 Apr 2011 02:29:21 +0000 (14:29 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Fri, 8 Apr 2011 02:29:21 +0000 (14:29 +1200)
commit1e7c5166aa4fa8f983cce549803c8ddc8893c846
treec6241a07d467f1b0bf7beaa4d6de424681570fa2
parent1c9ef0f9aeb35d42068db99615db677974c95d16
parent8307a1f79d8143e05c734cc750bb420c1ff41e1c
Merge remote branch 'kc/master' into new/enh/bug_5917
C4/Auth.pm
catalogue/search.pl