Merge branch 'MDL-44247-master' of git://github.com/FMCorz/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 24 Feb 2014 06:32:49 +0000 (14:32 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 24 Feb 2014 06:32:49 +0000 (14:32 +0800)

Trivial merge