Merge branch 'MDL-53865-master' of git://github.com/junpataleta/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 26 Apr 2016 01:38:33 +0000 (09:38 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 26 Apr 2016 01:38:33 +0000 (09:38 +0800)

Trivial merge