projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d949472 44b52a4)
Merge remote-tracking branch 'kc/master' into new/bug_5683
authorChris Cormack <chrisc@catalyst.net.nz>
Wed, 1 Jun 2011 21:02:50 +0000 (09:02 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Wed, 1 Jun 2011 21:02:50 +0000 (09:02 +1200)

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