Merge branch 'MDL-54667-master' of git://github.com/junpataleta/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 31 May 2016 04:46:59 +0000 (12:46 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 31 May 2016 04:46:59 +0000 (12:46 +0800)

Trivial merge