Merge branch 'master' of git://git.koha-community.org/koha
authorLars Wirzenius <lars@catalyst.net.nz>
Thu, 27 May 2010 00:08:06 +0000 (12:08 +1200)
committerLars Wirzenius <lars@catalyst.net.nz>
Thu, 27 May 2010 00:08:06 +0000 (12:08 +1200)
commit65858d8e1b47ff8d91fe0f6eccbaf1eaeba7ee23
treecdc9108a76e4b8ea1d02806910fbaf89e0cd5cdc
parent33b9f6a9c9b3c4f4022a5ff16b95d39781844f9f
parentbef08997420b0d418d39fcef09e68789621bb76c
Merge branch 'master' of git://git.koha-community.org/koha