Merge branch 'wip-MDL-57299-master' of git://github.com/abgreeve/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 12 Dec 2016 12:39:52 +0000 (12:39 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 12 Dec 2016 12:39:52 +0000 (12:39 +0000)
commit394fd5f92ed12f9a90e03255d885695c3215619f
tree4e5f81722a61925ba29e72ae1fee34ca56fe10d5
parent4d8c059cfac768691eb353d6612d4371ba2370b4
parentd8ecf9754e0115f94770546fa331f6ffb9fa3245
Merge branch 'wip-MDL-57299-master' of git://github.com/abgreeve/moodle