Merge branch 'MDL-52035_master' of git://github.com/markn86/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 28 Apr 2016 05:37:00 +0000 (13:37 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 29 Apr 2016 11:17:56 +0000 (12:17 +0100)
commiteca318d93759c2d3f26de9f356ce69d9eda48c4d
tree9cd43dbd7b4c9cec78a76c6f0b1c6d5349ee30f2
parent1f491b60c30f4f15bf447d14d5c137edfb4a8600
parent3bc725238963645d9387f6a9d7cd1db920db583b
Merge branch 'MDL-52035_master' of git://github.com/markn86/moodle