projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 27ec47b 2468bab)
Merge remote-tracking branch 'kc/new/bug_5683' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Wed, 1 Jun 2011 21:12:29 +0000 (09:12 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Wed, 1 Jun 2011 21:12:29 +0000 (09:12 +1200)

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