Merge branch 'MDL-50540-master' of git://github.com/FMCorz/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 7 Dec 2015 06:41:20 +0000 (14:41 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 7 Dec 2015 06:41:20 +0000 (14:41 +0800)

Trivial merge