Merge branch 'MDL-31356_master' of https://github.com/StudiUM/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 19 Jul 2016 12:01:34 +0000 (13:01 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 19 Jul 2016 12:01:34 +0000 (13:01 +0100)
commitff0039689be5fec09ff3c3be2c1c5efa87007592
treed1ec9a06f13cea42f6af2d94e18c4f0845fb126a
parent4feed617028bca769084216673943e67a50f5ebf
parentcc6b92483a8fc04ed86c1655c51c3e4505816385
Merge branch 'MDL-31356_master' of https://github.com/StudiUM/moodle