Merge branch 'MDL-51568-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 13 Oct 2015 02:11:55 +0000 (10:11 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 13 Oct 2015 02:11:55 +0000 (10:11 +0800)

Trivial merge