projects / koha-ffzg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0060b10 60dd25b)
Merge branch 'new/bug_5690' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Fri, 4 Feb 2011 00:23:46 +0000 (13:23 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Fri, 4 Feb 2011 00:23:46 +0000 (13:23 +1300)

Trivial merge
KOHA@FFZG based on git://git.koha.org/pub/scm/koha.git