Merge branch 'MDL-56795-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 22 Nov 2016 21:01:59 +0000 (21:01 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 22 Nov 2016 21:01:59 +0000 (21:01 +0000)
commit95b25310cedf319b43160f99a01b5abe8690c4b9
tree6653ca644bc5af226691164725a6ded4f1a025b8
parent1da2cf3bc02c8d5be46c53688284285ae11ab431
parentef25d51f5b8f2772d505832f2f52ec266bd90d1b
Merge branch 'MDL-56795-master' of git://github.com/damyon/moodle