Merge branch 'wip-MDL-46262-master' of git://github.com/marinaglancy/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 5 Nov 2014 06:38:11 +0000 (14:38 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 5 Nov 2014 06:38:11 +0000 (14:38 +0800)

Trivial merge