Merge branch 'wip-MDL-46038-master' of git://github.com/marinaglancy/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 24 Jun 2014 05:10:32 +0000 (13:10 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 24 Jun 2014 05:10:32 +0000 (13:10 +0800)

Trivial merge