projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4d6b38c a161612)
Merge remote branch 'kc/master'
authorChris Cormack <chrisc@catalyst.net.nz>
Wed, 28 Jul 2010 21:35:42 +0000 (09:35 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Wed, 28 Jul 2010 21:35:42 +0000 (09:35 +1200)

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