Merge branch 'MDL-51759-master-2' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 19 Oct 2015 05:30:17 +0000 (13:30 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 19 Oct 2015 05:30:17 +0000 (13:30 +0800)

Trivial merge