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)
commit502bcf9738bf0476e275f796a4035d5349b4218d
treeda28d8f38b5af180a8331a756cad0eec8fefd30d
parent2a72614f5379974fd9647e40a08a9ca36b9ca512
parent01f329babe0042d8044fd7d9aa87532a54914773
Merge branch 'MDL-50318-master-courseresources' of git://github.com/mudrd8mz/moodle