Merge branch 'MDL-50992-master' of git://github.com/damyon/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 10 Aug 2015 03:17:30 +0000 (11:17 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 10 Aug 2015 03:17:30 +0000 (11:17 +0800)

Trivial merge