Merge branch 'MDL-52472-master' of git://github.com/danpoltawski/moodle
authorDavid Monllao <davidm@moodle.com>
Fri, 11 Dec 2015 08:02:46 +0000 (16:02 +0800)
committerDavid Monllao <davidm@moodle.com>
Fri, 11 Dec 2015 08:02:46 +0000 (16:02 +0800)

Trivial merge