Merge branch 'translation' of git://git.workbuffer.org/git/koha into master
authorGalen Charlton <gmcharlt@gmail.com>
Wed, 6 Oct 2010 20:26:37 +0000 (16:26 -0400)
committerGalen Charlton <gmcharlt@gmail.com>
Wed, 6 Oct 2010 20:26:53 +0000 (16:26 -0400)
commit7475c9dd476cb4343583e2778efd5b05495ba8c6
treeaed6994b250dcca1100768c4713a20b0cae22c73
parent8ece6223b92ecf1f1e60813ac6782ea1d86c5516
parentf7a455d1eb343a2c21a22e16a9c95eb5af942a53
Merge branch 'translation' of git://git.workbuffer.org/git/koha into master

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