Merge branch 'MDL-54702_master' of https://github.com/snake/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 6 Jun 2016 12:41:48 +0000 (13:41 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 6 Jun 2016 12:41:48 +0000 (13:41 +0100)
commit5bd52435b4d11ff0deadf6f2cb11b256e31ea7cf
treeed5f922560fdd84f8718098aeaa07838c163d9bc
parente750544a06c294de37a739fc8b92172c083a3a2c
parentc724c9882994900ac778ab48343b038bc06a5db4
Merge branch 'MDL-54702_master' of https://github.com/snake/moodle