Merge branch 'MDL-54623-master' of git://github.com/junpataleta/moodle
authorDavid Monllao <davidm@moodle.com>
Fri, 20 May 2016 05:53:26 +0000 (13:53 +0800)
committerDavid Monllao <davidm@moodle.com>
Fri, 20 May 2016 05:53:26 +0000 (13:53 +0800)

Trivial merge