Merge branch 'master' of git+ssh://git.catalyst.net.nz/git/public/koha
authorLars Wirzenius <lars@catalyst.net.nz>
Thu, 27 May 2010 00:07:30 +0000 (12:07 +1200)
committerLars Wirzenius <lars@catalyst.net.nz>
Thu, 27 May 2010 00:07:30 +0000 (12:07 +1200)
commit33b9f6a9c9b3c4f4022a5ff16b95d39781844f9f
treeaba39ae94a312ab5c7fff0c79fa4c9cf79fa7b8b
parent6241d54c52b9ad1e8f1117b260cbbc86c4d37faa
parent3656d00eaf8d12cb3570c5bd92fe31d717c68a83
Merge branch 'master' of git+ssh://git.catalyst.net.nz/git/public/koha