Merge branch 'wip-MDL-52697-master' of git://github.com/abgreeve/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 11 Jan 2016 09:24:22 +0000 (09:24 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 11 Jan 2016 09:24:22 +0000 (09:24 +0000)
commitb8ebc30cd109ff3eaaf914872aa779e59fb27d36
tree76bff97f9a7e9e02b1f6ac7b00b2ae5609351081
parente65dfd9f288725eaf07b8273db79a62aa8e12f3c
parent03af7e696eabb07665d16c23863e4dc276665dfd
Merge branch 'wip-MDL-52697-master' of git://github.com/abgreeve/moodle