Merge branch 'MDL-36271_m23' of https://github.com/markn86/moodle into MOODLE_23_STABLE
authorSam Hemelryk <sam@moodle.com>
Wed, 7 Nov 2012 22:06:58 +0000 (11:06 +1300)
committerSam Hemelryk <sam@moodle.com>
Wed, 7 Nov 2012 22:06:58 +0000 (11:06 +1300)

Trivial merge