projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8ece622 f7a455d)
Merge branch 'translation' of git://git.workbuffer.org/git/koha into master
authorGalen Charlton <gmcharlt@gmail.com>
Wed, 6 Oct 2010 20:26:37 +0000 (16:26 -0400)
committerGalen Charlton <gmcharlt@gmail.com>
Wed, 6 Oct 2010 20:26:53 +0000 (16:26 -0400)
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

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