Merge branch 'MDL-54577-master' of git://github.com/cameron1729/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 30 May 2016 07:45:47 +0000 (15:45 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 30 May 2016 07:45:47 +0000 (15:45 +0800)

Trivial merge