projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d199984 c97868e)
Merge remote-tracking branch 'kc/new/bug_6170' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Sun, 29 May 2011 01:56:32 +0000 (13:56 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Sun, 29 May 2011 01:56:32 +0000 (13:56 +1200)

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