Merge branch 'wip-MDL-22183-master' of git://github.com/abgreeve/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 22 Aug 2016 08:19:59 +0000 (09:19 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 22 Aug 2016 08:19:59 +0000 (09:19 +0100)
commitcf6ae1205e084c2dd972a6b32f26c49ff988b64d
tree180a8d2391ada8323c30ce20a64b092a005b1ebc
parent3ca3cc77a27aa838a24a33eb461b8be3e5ba8fa3
parent3b873397e6d13f5e0a86acb81f3ce81acd1c66f7
Merge branch 'wip-MDL-22183-master' of git://github.com/abgreeve/moodle