]> git.koha-community.org Git - koha.git/commit
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)
commitc8df6bdcc9fe2523a77c839270b31304d8e13ee5
tree7a8632c5913617f44ff0a0556ed86e1c590c9ef8
parent69333c9f79bf2cb8ac4e58f46da714dca962a8ee
parent8d7608cd64a74d3513fb618d39a5a0f414fdf6a3
Merge remote-tracking branch 'kc/new/bug_5995' into kcmaster

Conflicts:
opac/sco/sco-main.pl