Merge branch 'MDL-52086' of git://github.com/bostelm/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 23 Nov 2015 08:10:25 +0000 (16:10 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 23 Nov 2015 08:10:25 +0000 (16:10 +0800)

Trivial merge