Merge branch 'wip-MDL-42731-master' of git://github.com/marinaglancy/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 3 Dec 2013 09:29:39 +0000 (17:29 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 3 Dec 2013 09:29:39 +0000 (17:29 +0800)

Trivial merge