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

Trivial merge