Merge branch 'MDL-39488_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE
authorSam Hemelryk <sam@moodle.com>
Fri, 10 May 2013 04:30:29 +0000 (16:30 +1200)
committerSam Hemelryk <sam@moodle.com>
Fri, 10 May 2013 04:30:29 +0000 (16:30 +1200)

Trivial merge