Merge branch 'MDL-52361-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Fri, 11 Dec 2015 06:49:15 +0000 (14:49 +0800)
committerDavid Monllao <davidm@moodle.com>
Fri, 11 Dec 2015 06:49:15 +0000 (14:49 +0800)

Trivial merge