Merge branch 'MDL-58310-master' of https://github.com/xow/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 19 Jun 2017 05:25:10 +0000 (13:25 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 19 Jun 2017 05:25:10 +0000 (13:25 +0800)
commitd745f174a2a6c6239c0e756bf000f4aa3f071a4a
tree8ebf7848c8a3a4de3c05538e86038341e1b61b6d
parent66b8ad8642c8e96c4ca8009a139e94c644ada1eb
parent671be2bedba7393123a8a3422865612e40b8c6f2
Merge branch 'MDL-58310-master' of https://github.com/xow/moodle