projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 29d17ca 5cb133d)
Merge remote branch 'kc/master'
authorChris Cormack <chrisc@catalyst.net.nz>
Thu, 14 Oct 2010 20:50:18 +0000 (09:50 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Thu, 14 Oct 2010 20:50:18 +0000 (09:50 +1300)

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