Merge branch 'MDL-54545-master' of git://github.com/junpataleta/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 16 May 2016 09:24:25 +0000 (10:24 +0100)
committerDavid Monllao <davidm@moodle.com>
Tue, 17 May 2016 09:16:09 +0000 (17:16 +0800)

Trivial merge