Merge branch 'MDL-44006-m' of https://github.com/micaherne/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 24 Feb 2014 04:30:55 +0000 (12:30 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 24 Feb 2014 04:30:55 +0000 (12:30 +0800)

Trivial merge