Merge branch 'MDL-48089-master' of git://github.com/danpoltawski/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 20 Apr 2016 04:24:07 +0000 (12:24 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 20 Apr 2016 04:24:07 +0000 (12:24 +0800)

Trivial merge