projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 57a0fcb 14102a6)
Merge branch 'new/bug_4330' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Sat, 27 Aug 2011 07:34:36 +0000 (19:34 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Sat, 27 Aug 2011 07:34:36 +0000 (19:34 +1200)

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