Merge branch 'MDL-53519-master' of git://github.com/lameze/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 21 Mar 2016 22:51:57 +0000 (06:51 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 21 Mar 2016 22:51:57 +0000 (06:51 +0800)

Trivial merge