Merge branch 'w04_MDL-31182_m23_messprefs' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 23 Jan 2012 06:46:05 +0000 (14:46 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 23 Jan 2012 06:46:05 +0000 (14:46 +0800)

Trivial merge