Merge branch 'translation' of git://git.workbuffer.org/git/koha into to-push
authorGalen Charlton <gmcharlt@gmail.com>
Wed, 2 Jun 2010 11:05:23 +0000 (07:05 -0400)
committerGalen Charlton <gmcharlt@gmail.com>
Wed, 2 Jun 2010 11:06:05 +0000 (07:06 -0400)
commit469b32f3180831b1946257b6bcb07699c713f226
tree05b18126bc8b5d63caef2ea1e57dc0647dea4dd7
parent79a0c93ddd26d48db64621012f122d87849d8251
parentf4e77ec1df31cedf88cbde3aa6a81a782780fc10
Merge branch 'translation' of git://git.workbuffer.org/git/koha into to-push

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>