projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b6c0431 b713484)
Merge commit 'biblibre/3.2_biblibre' into to-push
authorGalen Charlton <gmcharlt@gmail.com>
Thu, 28 Jan 2010 20:46:28 +0000 (15:46 -0500)
committerGalen Charlton <gmcharlt@gmail.com>
Thu, 28 Jan 2010 20:47:00 +0000 (15:47 -0500)
Final round of acquisitions and related fixes from
BibLibre prior to 3.2 alpha

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

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