projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3c19f22 c25aaf1)
Merge remote branch 'kc/new/bug_5143' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Mon, 20 Dec 2010 00:24:40 +0000 (13:24 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Mon, 20 Dec 2010 00:24:40 +0000 (13:24 +1300)

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