Merge branch 'MDL-13805_others_messages_23' of git://github.com/andyjdavis/moodle...
authorSam Hemelryk <sam@moodle.com>
Wed, 30 Jan 2013 19:45:32 +0000 (08:45 +1300)
committerSam Hemelryk <sam@moodle.com>
Wed, 30 Jan 2013 19:45:32 +0000 (08:45 +1300)

Trivial merge