Merge branch 'MDL-54121-master' of git://github.com/damyon/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 17 May 2016 03:16:34 +0000 (11:16 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 17 May 2016 09:16:12 +0000 (17:16 +0800)

Trivial merge