Merge branch 'translation' of git://git.workbuffer.org/git/koha into master
authorGalen Charlton <gmcharlt@gmail.com>
Wed, 6 Oct 2010 10:31:43 +0000 (06:31 -0400)
committerGalen Charlton <gmcharlt@gmail.com>
Wed, 6 Oct 2010 10:32:07 +0000 (06:32 -0400)
commitbd8a04e30845344e602ed98f0d277a0239b2a999
tree590ec94c993993687da816307e9df72d15b2a0d0
parentc4601faf13c5e7209e085e177048a2deb088c17c
parenta26440bafa584e6b9d1c5674a2b8b973c8f7d69d
Merge branch 'translation' of git://git.workbuffer.org/git/koha into master

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