Merge branch 'MDL-39185_m23' of https://github.com/markn86/moodle into MOODLE_23_STABLE
authorSam Hemelryk <sam@moodle.com>
Fri, 19 Apr 2013 01:53:19 +0000 (13:53 +1200)
committerSam Hemelryk <sam@moodle.com>
Fri, 19 Apr 2013 01:53:19 +0000 (13:53 +1200)

Trivial merge