projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 769acee c56d12c)
Merge remote-tracking branch 'kc/new/bug_6094' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Thu, 20 Oct 2011 15:32:31 +0000 (04:32 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Thu, 20 Oct 2011 15:32:31 +0000 (04:32 +1300)

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