Merge branch 'wip-MDL-47583-master' of git://github.com/marinaglancy/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 15 Oct 2014 05:46:28 +0000 (13:46 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 15 Oct 2014 05:46:28 +0000 (13:46 +0800)

Trivial merge