Merge branch 'MDL-51142-master' of git://github.com/damyon/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 3 May 2016 01:57:40 +0000 (09:57 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 3 May 2016 01:57:40 +0000 (09:57 +0800)

Trivial merge