Merge branch 'MDL-52438-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 10 Dec 2015 07:31:29 +0000 (15:31 +0800)
committerDavid Monllao <davidm@moodle.com>
Thu, 10 Dec 2015 07:31:29 +0000 (15:31 +0800)

Trivial merge