projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4bade72 807c1a5)
Merge branch 'translation' of git://git.workbuffer.org/git/koha into master
authorGalen Charlton <gmcharlt@gmail.com>
Mon, 22 Feb 2010 01:07:04 +0000 (20:07 -0500)
committerGalen Charlton <gmcharlt@gmail.com>
Mon, 22 Feb 2010 01:07:40 +0000 (20:07 -0500)
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

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