Merge branch 'w52_MDL-13572_m23_messaging' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 2 Jan 2012 22:00:42 +0000 (11:00 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 2 Jan 2012 22:00:42 +0000 (11:00 +1300)

Trivial merge