Merge branch 'MDL-51306' of https://github.com/andrewhancox/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 8 Feb 2016 03:23:34 +0000 (11:23 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 8 Feb 2016 03:23:34 +0000 (11:23 +0800)
commit502648e3a68c85d8cf2488138d36b63ef9128cbb
tree7a5cfc13de6de940ccc4b53613c13f32cb6bba2d
parent7a662077f1a3c065ddfab149e8dc0bb91909e0e0
parent279918e126c3eb849a77fec1fc9420673ec8463d
Merge branch 'MDL-51306' of https://github.com/andrewhancox/moodle