projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a37225a 79a0c93)
Merge branch 'master' of git://git.koha-community.org/koha
authorLars Wirzenius <lars@catalyst.net.nz>
Fri, 28 May 2010 01:49:20 +0000 (13:49 +1200)
committerLars Wirzenius <lars@catalyst.net.nz>
Fri, 28 May 2010 01:49:20 +0000 (13:49 +1200)

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