Merge branch 'MDL-50564-master' of git://github.com/junpataleta/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 16 Nov 2015 06:19:18 +0000 (14:19 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 16 Nov 2015 06:19:18 +0000 (14:19 +0800)

Trivial merge