Merge branch 'MDL-52204-master' of git://github.com/danpoltawski/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 7 Dec 2015 08:30:38 +0000 (16:30 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 7 Dec 2015 08:30:38 +0000 (16:30 +0800)

Trivial merge