Merge branch 'MDL-55565-master' of https://github.com/snake/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 22 Aug 2016 13:22:38 +0000 (14:22 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 22 Aug 2016 13:22:38 +0000 (14:22 +0100)
commit42def6ef5c96212d9bdfca6ab3829e02cbc41dab
treeef959b2d50111e507baa3ef1519eb2875e03293a
parent4ac1bb2f348b48b02377e445ea06bc4776ca19c8
parentd8e73d61b9c29a3c1eea5ad996f8bc8d5eb6dd9b
Merge branch 'MDL-55565-master' of https://github.com/snake/moodle