Merge branch 'master' of git+ssh://git.catalyst.net.nz/git/public/koha
authorLars Wirzenius <lars@catalyst.net.nz>
Thu, 27 May 2010 23:26:59 +0000 (11:26 +1200)
committerLars Wirzenius <lars@catalyst.net.nz>
Thu, 27 May 2010 23:26:59 +0000 (11:26 +1200)
commita37225a1f71f83a46466538cdb0a1d38ca72ae9f
treede1876110e2a0ef97209fa47364f25c75af2563d
parent65858d8e1b47ff8d91fe0f6eccbaf1eaeba7ee23
parent6843f5a346da3d0c0e55b7168750190c9194297b
Merge branch 'master' of git+ssh://git.catalyst.net.nz/git/public/koha