Merge branch 'MDL-58884-master' of git://github.com/StudiUM/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 16 May 2017 02:41:41 +0000 (10:41 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 16 May 2017 02:41:41 +0000 (10:41 +0800)

Trivial merge