Merge branch '5370_koha.org' of git://github.com/kfischer/Koha into new/bug_5370
authorChris Cormack <chrisc@catalyst.net.nz>
Sun, 7 Nov 2010 20:31:28 +0000 (09:31 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Sun, 7 Nov 2010 20:31:46 +0000 (09:31 +1300)
commit44b3ac1196d7c94878eace1c22697d6a52f1b6ac
tree3d87f3f0cb4ac60e408966e76701524b9d410c90
parent35cf30ef15943240e823b7cdfc0d233727a4011d
parent2f16504e9a2626940127c44492a463e685305f04
Merge branch '5370_koha.org' of git://github.com/kfischer/Koha into new/bug_5370

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>