projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 79a0c93 f4e77ec)
Merge branch 'translation' of git://git.workbuffer.org/git/koha into to-push
authorGalen Charlton <gmcharlt@gmail.com>
Wed, 2 Jun 2010 11:05:23 +0000 (07:05 -0400)
committerGalen Charlton <gmcharlt@gmail.com>
Wed, 2 Jun 2010 11:06:05 +0000 (07:06 -0400)
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

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