Merge branch 'MDL-54677' of git://github.com/stronk7/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 23 May 2016 01:13:40 +0000 (09:13 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 23 May 2016 01:13:40 +0000 (09:13 +0800)

Trivial merge