From: Galen Charlton Date: Wed, 3 Feb 2010 00:10:11 +0000 (-0500) Subject: Merge commit 'workbuffer.org-koha/translation' into to-push X-Git-Tag: v3.02.00-alpha~10 X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=commitdiff_plain;h=f36c042b80f053b7f75dfc1aff12a312e5a59134;p=koha_fer Merge commit 'workbuffer.org-koha/translation' into to-push Conflicts: installer/data/mysql/updatedatabase.pl Signed-off-by: Galen Charlton --- f36c042b80f053b7f75dfc1aff12a312e5a59134