Merge branch 'MDL-49490-master' of git://github.com/danpoltawski/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 23 Nov 2015 05:56:06 +0000 (13:56 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 23 Nov 2015 05:56:06 +0000 (13:56 +0800)

Trivial merge