Merge branch 'MDL-56214-master' of git://github.com/FMCorz/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 18 Oct 2016 07:02:41 +0000 (15:02 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 18 Oct 2016 07:02:41 +0000 (15:02 +0800)

Trivial merge