projects / koha.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: eb6b10f 721c104)
Merge commit 'workbuffer.org-koha/translation' into to-push
authorGalen Charlton <gmcharlt@gmail.com>
Wed, 3 Feb 2010 00:10:11 +0000 (19:10 -0500)
committerGalen Charlton <gmcharlt@gmail.com>
Wed, 3 Feb 2010 00:10:41 +0000 (19:10 -0500)
commitf36c042b80f053b7f75dfc1aff12a312e5a59134
tree382552b3aa7331e3dd90a77cd0fdd651a8b55df3tree | snapshot
parenteb6b10f8c91cfd06fe4a5e981c1d28e31271bc56commit | diff
parent721c1047ee414c67d179fd2ef095894b47d0530ccommit | diff
Merge commit 'workbuffer.org-koha/translation' into to-push

Conflicts:
installer/data/mysql/updatedatabase.pl

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Koha ILS @ FFZG - based on git://git.koha.org/pub/scm/koha.git