Merge branch 'MDL-52682-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 25 Jan 2016 07:38:29 +0000 (15:38 +0800)
committerDavid Monllao <davidm@moodle.com>
Fri, 29 Jan 2016 02:15:17 +0000 (10:15 +0800)

Trivial merge