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)
commit86e73f89811ed1cbe8394294c3fde614553e5d9a
treece59f4a496919f26acf2d172bd50538b66b951f6
parent458e91d8ca7e81c06380395887563474b6a6f5d9
parent681570b42922886d1d5c0039e633c45c6c4999a7
Merge branch 'w04_MDL-31182_m23_messprefs' of git://github.com/skodak/moodle