Merge branch 'MDL-30132_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE
authorSam Hemelryk <sam@moodle.com>
Mon, 17 Jun 2013 22:26:10 +0000 (10:26 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 17 Jun 2013 22:26:10 +0000 (10:26 +1200)

Trivial merge