Merge branch 'MDL-50483-master' of git://github.com/lameze/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 19 Oct 2015 09:06:03 +0000 (17:06 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 19 Oct 2015 09:06:03 +0000 (17:06 +0800)

Trivial merge