Merge branch 'MDL-35982-master' of git://github.com/danpoltawski/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 30 Nov 2015 07:45:44 +0000 (15:45 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 30 Nov 2015 07:45:44 +0000 (15:45 +0800)

Trivial merge