]> git.koha-community.org Git - koha.git/commit
Merge remote branch 'kc/master' into new/bug_5105
authorChris Cormack <chrisc@catalyst.net.nz>
Wed, 10 Nov 2010 22:33:10 +0000 (11:33 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Wed, 10 Nov 2010 22:33:10 +0000 (11:33 +1300)
commitdcb86689f73089ceaa789a92c34e78200d05af61
tree8d9e50bd0bd7efd9c6430384089e3a643c78d562
parenta9010530a331d9ee047e0d42a9f8206a206027a3
parent5e1b8167c24e0322d94bfc919556d927d875cf97
Merge remote branch 'kc/master' into new/bug_5105

Conflict fixed

Conflicts:
opac/opac-detail.pl
opac/opac-detail.pl