Merge branch 'MDL-51889_master' of git://github.com/markn86/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 29 Dec 2015 07:35:15 +0000 (15:35 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 29 Dec 2015 07:35:15 +0000 (15:35 +0800)

Trivial merge