projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 122bc58 6466ac8)
Merge branch 'new/bug_4218' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Mon, 13 Dec 2010 02:57:17 +0000 (15:57 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Mon, 13 Dec 2010 02:57:17 +0000 (15:57 +1300)

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