Merge branch 'MDL-33560-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
authorSam Hemelryk <sam@moodle.com>
Mon, 23 Jul 2012 00:25:20 +0000 (12:25 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 23 Jul 2012 00:25:20 +0000 (12:25 +1200)

Trivial merge