Merge remote branch 'kc/master' into new/bug_5817
authorChris Cormack <chrisc@catalyst.net.nz>
Mon, 28 Mar 2011 19:44:48 +0000 (08:44 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Mon, 28 Mar 2011 19:44:48 +0000 (08:44 +1300)
commit63541e4223224831e4eb2bb51d108cc4a2155388
treed2d8e99d30797e67984890892b6c6d1083616b10
parent32d5fe33aaebde6b4b8d570dca723002940980db
parentc9ca5edf85a25b9f9b1584a0f490d4176c1d05e4
Merge remote branch 'kc/master' into new/bug_5817
koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl