projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c597635 641616e)
Merge remote branch 'kc/master' into new/bug_5940
authorChris Cormack <chrisc@catalyst.net.nz>
Thu, 31 Mar 2011 07:45:52 +0000 (20:45 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Thu, 31 Mar 2011 07:45:52 +0000 (20:45 +1300)

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