Merge branch 'wip-MDL-52252-master' of https://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 9 Mar 2016 07:35:16 +0000 (15:35 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 9 Mar 2016 07:35:16 +0000 (15:35 +0800)

Trivial merge