projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c4601fa a26440b)
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)
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

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