Merge branch 'MDL-56194-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 5 Oct 2016 09:25:30 +0000 (10:25 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 5 Oct 2016 09:25:30 +0000 (10:25 +0100)
commitf3da9c49a8863a74a809d58bd03e4817f6196384
treeb1a8aa1880e4fb61209a21ab5e83f7b25fafed47
parent5be14917597e58985deb18a7bcd6a0d042423159
parent23faa312a35eba8f229aff3e5a85f2b034a774f1
Merge branch 'MDL-56194-master' of git://github.com/FMCorz/moodle