Merge branch 'MDL-38474-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
authorDamyon Wiese <damyon@moodle.com>
Fri, 15 Mar 2013 05:04:33 +0000 (13:04 +0800)
committerDamyon Wiese <damyon@moodle.com>
Fri, 15 Mar 2013 05:04:33 +0000 (13:04 +0800)

Trivial merge