Merge branch 'MDL-50613-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 5 Oct 2015 04:10:40 +0000 (12:10 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 5 Oct 2015 04:10:40 +0000 (12:10 +0800)

Trivial merge