Merge branch 'master-MDL-49750' of git://github.com/jojoob/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 6 Oct 2015 01:28:03 +0000 (09:28 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 6 Oct 2015 15:26:53 +0000 (16:26 +0100)

Trivial merge