Merge branch 'translation' of git://git.workbuffer.org/git/koha into to-push
authorGalen Charlton <gmcharlt@gmail.com>
Fri, 3 Sep 2010 14:35:40 +0000 (10:35 -0400)
committerGalen Charlton <gmcharlt@gmail.com>
Fri, 3 Sep 2010 14:36:39 +0000 (10:36 -0400)
commite58961f689422aa1d5ed4518820481b16d62cb4a
treef29adf2c19ea11cfd2eba83253674858e2780d65
parenta1616127bdcfd7d765d7f73cce54cae5609e3a7f
parentc40b1d522996443d59fa5407cb777e5e4f31011f
Merge branch 'translation' of git://git.workbuffer.org/git/koha into to-push

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