projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 11c88cc fce5a2f)
Merge commit 'origin/master' into labels_recon
authorGalen Charlton <gmcharlt@gmail.com>
Sun, 6 Sep 2009 01:45:39 +0000 (21:45 -0400)
committerGalen Charlton <gmcharlt@gmail.com>
Sun, 6 Sep 2009 01:45:39 +0000 (21:45 -0400)

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