Merge branch 'wip-MDL-49852-master' of git://github.com/abgreeve/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 6 Jun 2016 10:59:42 +0000 (11:59 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 6 Jun 2016 10:59:42 +0000 (11:59 +0100)
commita7de32a265f397eae8ee8288c2573117c168978e
treebd9b4eadb35c2eba9e08f36d956a4726812c416c
parent294c24253244fdc31f2f8d07a9f297c6b1f938be
parent0cf8082a8fa7641740488b942c7b25a747619d21
Merge branch 'wip-MDL-49852-master' of git://github.com/abgreeve/moodle