projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1209d97 a5c8c25)
Merge remote-tracking branch 'kc/master' into new/bug_6350
authorChris Cormack <chrisc@catalyst.net.nz>
Tue, 5 Jul 2011 03:16:29 +0000 (15:16 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Tue, 5 Jul 2011 03:16:29 +0000 (15:16 +1200)

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