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

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