Merge remote branch 'kc/master' into new/enh/bug_5917
authorChris Cormack <chrisc@catalyst.net.nz>
Sun, 10 Apr 2011 08:00:04 +0000 (20:00 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Sun, 10 Apr 2011 08:00:04 +0000 (20:00 +1200)
commit77167b3b17690ccff682d410847b13aa5ac186e8
tree1cada392bf760e8916bffe3bae486084c8560c79
parent1e7c5166aa4fa8f983cce549803c8ddc8893c846
parent8843e29a9dd35fa3c34813077f4dfffd91483995
Merge remote branch 'kc/master' into new/enh/bug_5917

Conflicts:
installer/data/mysql/updatedatabase.pl
admin/branches.pl
installer/data/mysql/updatedatabase.pl
members/moremember.pl