Merge branch 'MDL-52261_master_file_not_found' of git://github.com/BenKelada/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 1 Feb 2016 05:55:57 +0000 (13:55 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 1 Feb 2016 05:55:57 +0000 (13:55 +0800)

Trivial merge