projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 69333c9 8d7608c)
Merge remote-tracking branch 'kc/new/bug_5995' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Fri, 21 Oct 2011 17:36:36 +0000 (06:36 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Fri, 21 Oct 2011 17:36:36 +0000 (06:36 +1300)
Conflicts:
opac/sco/sco-main.pl


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