Merge branch 'wip-MDL-43026-master' of git://github.com/marinaglancy/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 3 Dec 2013 08:11:48 +0000 (16:11 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 3 Dec 2013 08:11:48 +0000 (16:11 +0800)

Trivial merge