projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 35cf30e 2f16504)
Merge branch '5370_koha.org' of git://github.com/kfischer/Koha into new/bug_5370
authorChris Cormack <chrisc@catalyst.net.nz>
Sun, 7 Nov 2010 20:31:28 +0000 (09:31 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Sun, 7 Nov 2010 20:31:46 +0000 (09:31 +1300)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

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