Merge remote branch 'kc/master' into new/enh/bug_5917
authorChris Cormack <chrisc@catalyst.net.nz>
Thu, 7 Apr 2011 19:12:06 +0000 (07:12 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Thu, 7 Apr 2011 19:12:06 +0000 (07:12 +1200)
commitfe331a0209585b9ac84eff0e886cbe2eb67de0c9
tree4cb546f56c5da893476d3fc71433831cc9edec80
parent2fd51eb84447dd068d0f290648cfb74a866a933e
parent69d4d8f1cca9c536a0e182a847726f363768f578
Merge remote branch 'kc/master' into new/enh/bug_5917

Conflicts:
installer/data/mysql/updatedatabase.pl
catalogue/search.pl
installer/data/mysql/updatedatabase.pl