Merge branch 'MDL-49807-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 15 Feb 2016 07:11:09 +0000 (15:11 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 15 Feb 2016 07:11:09 +0000 (15:11 +0800)

Trivial merge