projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f46abf8 6127553)
Merge commit 'kc/master'
authorChris Cormack <chrisc@catalyst.net.nz>
Thu, 8 Jul 2010 03:02:45 +0000 (15:02 +1200)
committerChris Cormack <chrisc@catalyst.nz>
Thu, 8 Jul 2010 03:02:45 +0000 (15:02 +1200)

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