projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f6486e6 a3717c1)
Merge remote-tracking branch 'kc/new/bug_5860' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Sun, 12 Jun 2011 23:46:12 +0000 (11:46 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Sun, 12 Jun 2011 23:46:12 +0000 (11:46 +1200)

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