projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3bab38c aaebd7e)
Merge commit 'koha-biblibre/master' into bl-acq
authorGalen Charlton <gmcharlt@gmail.com>
Wed, 2 Dec 2009 02:01:33 +0000 (21:01 -0500)
committerGalen Charlton <gmcharlt@gmail.com>
Wed, 2 Dec 2009 02:01:33 +0000 (21:01 -0500)

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