Merge branch 'MDL-51839-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 16 Feb 2016 02:58:22 +0000 (10:58 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 16 Feb 2016 02:58:22 +0000 (10:58 +0800)

Trivial merge