Merge branch 'MDL-54609-master' of git://github.com/junpataleta/moodle
authorDavid Monllao <davidm@moodle.com>
Fri, 20 May 2016 01:22:07 +0000 (09:22 +0800)
committerDavid Monllao <davidm@moodle.com>
Fri, 20 May 2016 01:22:07 +0000 (09:22 +0800)

Trivial merge