projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2c88e1e a07127c)
Merge remote-tracking branch 'kc/new/awaiting_qa/bug_6316' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Thu, 4 Aug 2011 21:37:49 +0000 (09:37 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Thu, 4 Aug 2011 21:37:49 +0000 (09:37 +1200)

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