Merge branch 'MDL-43127-master-fixup' of https://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 26 Nov 2014 09:22:56 +0000 (09:22 +0000)
committerDan Poltawski <dan@moodle.com>
Wed, 26 Nov 2014 09:22:56 +0000 (09:22 +0000)
commit7bd780835b2e9ff8002da218a5ca42de8dc321b4
treef48855920463ad045af434808a6ae0b0a4381c02
parent1e7e4d5f01c7eaa2278aa38f8abd8c04197d51cc
parent18edf3a3255ad24f67ef6a01898646b4a686139c
Merge branch 'MDL-43127-master-fixup' of https://github.com/FMCorz/moodle