Merge branch 'MDL-48187_master' of git://github.com/markn86/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 20 Apr 2015 04:20:28 +0000 (12:20 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 20 Apr 2015 04:20:28 +0000 (12:20 +0800)

Trivial merge