Merge branch 'wip-MDL-35468-master' of git://github.com/marinaglancy/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 15 Sep 2014 05:16:59 +0000 (13:16 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 15 Sep 2014 05:16:59 +0000 (13:16 +0800)

Trivial merge