Merge branch 'MDL-53494_master' of https://github.com/StudiUM/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 26 Apr 2016 10:31:55 +0000 (11:31 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 26 Apr 2016 10:31:55 +0000 (11:31 +0100)
commit587580a0df7425e6deba22fc4cdc2eeacbf3f5da
tree73f15120b97622cecf4a9f0f72de706523f183f2
parent2ef629e86df4a8c51ba07edf975164c3501018f9
parent7fbbd771f781df4e095a010ec88d4ad10e5d7577
Merge branch 'MDL-53494_master' of https://github.com/StudiUM/moodle