Merge branch 'MDL-41643-master' of git://github.com/jojoob/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 16 Nov 2015 06:54:19 +0000 (14:54 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 16 Nov 2015 06:54:19 +0000 (14:54 +0800)

Trivial merge