Merge branch 'MDL-51478-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 5 Oct 2015 05:38:43 +0000 (13:38 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 5 Oct 2015 05:38:43 +0000 (13:38 +0800)

Trivial merge