Merge branch 'wip-MDL-46703-master' of git://github.com/marinaglancy/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 25 Aug 2014 05:49:05 +0000 (13:49 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 25 Aug 2014 05:49:05 +0000 (13:49 +0800)

Trivial merge