Chris Cormack 77167b3b17 Merge remote branch 'kc/master' into new/enh/bug_5917 ... Conflicts: installer/data/mysql/updatedatabase.pl		2011-04-10 20:00:04 +12:00
..
mandatory	Bug 5984 : Follow up : Catching the rest of the languages sysprefs	2011-04-10 19:38:01 +12:00
marcflavour	Bug 5839: Add mapping for items.stocknumber to MARC21	2011-04-04 21:27:01 +12:00
optional	Bug 5917 : Fixing messaging preferences	2011-04-04 14:15:14 +12:00