Merge branch 'MDL-50318-master-courseresources' of git://github.com/mudrd8mz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 26 May 2015 12:05:16 +0000 (13:05 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 26 May 2015 12:05:16 +0000 (13:05 +0100)

Trivial merge