Merge branch 'MDL-56725-master' of git://github.com/damyon/moodle
commit6063f62e7de2ff5fd34826824db1a8e67fa1e83e
authorDan Poltawski <dan@moodle.com>
Thu, 10 Nov 2016 15:37:38 +0000 (10 15:37 +0000)
committerDan Poltawski <dan@moodle.com>
Thu, 10 Nov 2016 15:37:38 +0000 (10 15:37 +0000)
tree4897ce61734dadfd590ab75f9e54d61cc28fa126
parenta3ead7172b39eea5ae66f1fcccdf965f23586a94
parent930ce60550cb2829150907279721cb13654422e1
Merge branch 'MDL-56725-master' of git://github.com/damyon/moodle