Merge remote branch 'kc/new/enh/bug_5880' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Thu, 24 Mar 2011 09:09:50 +0000 (22:09 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Thu, 24 Mar 2011 09:09:50 +0000 (22:09 +1300)
1  2 
C4/Koha.pm

diff --cc C4/Koha.pm
Simple merge