Merge branch 'MDL-54613-m' of https://github.com/micaherne/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 19 May 2016 03:20:58 +0000 (11:20 +0800)
committerDavid Monllao <davidm@moodle.com>
Thu, 19 May 2016 03:20:58 +0000 (11:20 +0800)

Trivial merge