Merge branch 'MDL-51514_master' of git://github.com/markn86/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 5 Oct 2015 07:59:43 +0000 (15:59 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 5 Oct 2015 07:59:43 +0000 (15:59 +0800)

Trivial merge