Merge branch 'MDL-55173-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 18 Jul 2016 23:48:28 +0000 (01:48 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 18 Jul 2016 23:48:28 +0000 (01:48 +0200)
commitdb26654b701f994b204924090d38a1305e1e44b8
tree1e558aeadfacf5758226709d9fad0b3b06c47dda
parentb3b18330973db5e3dc04b813331cee2c0154ab4c
parentd16185fd4f6c50561643a24e883a41faaaadcd83
Merge branch 'MDL-55173-master' of git://github.com/andrewnicols/moodle