Merge branch 'MDL-52208-master-2' of git://github.com/junpataleta/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 16 Feb 2016 06:39:46 +0000 (14:39 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 16 Feb 2016 06:39:46 +0000 (14:39 +0800)

Trivial merge