Merge branch 'MDL-54664-master' of git://github.com/junpataleta/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 23 May 2016 01:50:44 +0000 (09:50 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 23 May 2016 01:50:44 +0000 (09:50 +0800)

Trivial merge