Merge branch 'MDL-38452-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
authorDamyon Wiese <damyon@moodle.com>
Mon, 8 Apr 2013 06:08:52 +0000 (14:08 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 8 Apr 2013 06:08:52 +0000 (14:08 +0800)

Trivial merge