Merge branch 'wip-MDL-55107-master' of git://github.com/abgreeve/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 12 Jul 2016 11:03:19 +0000 (13:03 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 12 Jul 2016 11:03:19 +0000 (13:03 +0200)
commit64c1e707a98fbf1696ab014f5369b6d17213b885
tree42e1b2fd3466b3d3fcb93e0eb1eeb8d8b3d72477
parentb60d4fca13fa67a2baa511e05755a5fc02a0142e
parent97a85bf6f021fb4223426f34ef155ba9e4b0f1fe
Merge branch 'wip-MDL-55107-master' of git://github.com/abgreeve/moodle