Merge branch 'MDL-54177_master' of git://github.com/markn86/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 16 May 2016 07:25:52 +0000 (15:25 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 17 May 2016 09:16:08 +0000 (17:16 +0800)

Trivial merge