Merge branch 'master_MDL-46669' of https://github.com/danmarsden/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 18 Aug 2014 08:21:11 +0000 (16:21 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 18 Aug 2014 08:21:54 +0000 (16:21 +0800)

Trivial merge