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

Trivial merge