Merge branch 'MDL-58704-master' of git://github.com/lameze/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 8 May 2017 05:58:59 +0000 (13:58 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 8 May 2017 05:58:59 +0000 (13:58 +0800)
commitd36377804ea363d03d0cb94ae7bc40e17c6a8c40
tree97f0d177a54a454c152d0b888fea9fe4614a6e98
parent5d9c1b2f8eaa11595baccb7b2ed5786ce75a621f
parent8f60a02d5fec9b04ae1b3b52f43b561c81a155a4
Merge branch 'MDL-58704-master' of git://github.com/lameze/moodle