Merge branch 'MDL-52017_master' of git://github.com/markn86/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 22 Dec 2015 08:36:29 +0000 (16:36 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 22 Dec 2015 08:36:29 +0000 (16:36 +0800)

Trivial merge