Merge branch 'master' of git://git.koha-community.org/koha
authorLars Wirzenius <lars@catalyst.net.nz>
Fri, 28 May 2010 01:49:20 +0000 (13:49 +1200)
committerLars Wirzenius <lars@catalyst.net.nz>
Fri, 28 May 2010 01:49:20 +0000 (13:49 +1200)
commit62a98b3af7221e6e0c994b0bf606300f2a3d1442
treede1876110e2a0ef97209fa47364f25c75af2563d
parenta37225a1f71f83a46466538cdb0a1d38ca72ae9f
parent79a0c93ddd26d48db64621012f122d87849d8251
Merge branch 'master' of git://git.koha-community.org/koha