projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
Conflicts:
installer/data/mysql/updatedatabase.pl

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

Trivial merge
Koha ILS @ FFZG - based on git://git.koha.org/pub/scm/koha.git