Merge branch 'MDL-54661-master' of git://github.com/junpataleta/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 23 May 2016 06:23:57 +0000 (14:23 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 23 May 2016 06:23:57 +0000 (14:23 +0800)

Trivial merge