Merge branch 'wip-MDL-53923-master' of git://github.com/abgreeve/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 16 May 2016 08:31:45 +0000 (09:31 +0100)
committerDavid Monllao <davidm@moodle.com>
Tue, 17 May 2016 09:16:08 +0000 (17:16 +0800)
commit5a2283cdc0e67cde83346845f6ed4c18e20efbd6
tree4e4513e2c3d58330c0490b66b4430b42cfb1d82a
parentdf88d9a72e16e0193bc9782c3831929b169c337c
parent0eecf876878d690bb15c2d36ac3650ce15142c30
Merge branch 'wip-MDL-53923-master' of git://github.com/abgreeve/moodle