projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bf14b28 72fb44c)
Merge commit 'kc/master'
authorChris Cormack <chrisc@catalyst.net.nz>
Tue, 8 Jun 2010 10:08:13 +0000 (22:08 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Tue, 8 Jun 2010 10:08:13 +0000 (22:08 +1200)

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