Merge branch 'translation' of git://git.workbuffer.org/git/koha into master
authorGalen Charlton <gmcharlt@gmail.com>
Mon, 22 Feb 2010 01:07:04 +0000 (20:07 -0500)
committerGalen Charlton <gmcharlt@gmail.com>
Mon, 22 Feb 2010 01:07:40 +0000 (20:07 -0500)
commitdd187e09436a6ae72ec07ba2cd25629282aab2af
treef6a639659cc72147dce577bf03abc44f902469a8
parent4bade723efdf07a044eb88356b2038a63f8455fb
parent807c1a51dc172bdcee92c99d89b4be03ec3b77c5
Merge branch 'translation' of git://git.workbuffer.org/git/koha into master

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