Merge branch 'MDL-40009_m23' of https://github.com/markn86/moodle into MOODLE_23_STABLE
authorSam Hemelryk <sam@moodle.com>
Mon, 10 Jun 2013 03:54:34 +0000 (15:54 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 10 Jun 2013 03:54:34 +0000 (15:54 +1200)

Trivial merge