projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 192e148 92c350f)
Merge branch 'signoffs' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Mon, 1 Nov 2010 07:52:42 +0000 (20:52 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Mon, 1 Nov 2010 07:52:42 +0000 (20:52 +1300)

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