Merge remote branch 'kc/new/bug_5301' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Tue, 2 Nov 2010 17:54:50 +0000 (06:54 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Tue, 2 Nov 2010 17:54:50 +0000 (06:54 +1300)
1  2 
C4/Koha.pm

diff --cc C4/Koha.pm
Simple merge