Merge branch 'MDL-58991-master' of git://github.com/lameze/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 14 Jun 2017 08:56:11 +0000 (16:56 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 14 Jun 2017 11:32:02 +0000 (12:32 +0100)
commitef9b236d8a85ad5f09bb23704d7c04c1205edb3d
tree78c30e6eb0016df67c38d59882e973ccbb98ea5d
parent5dbb6b74a9c67529f234b88af74228d405fa1c97
parent01d22ff8c69c8c9b335957374635e09aef3851cc
Merge branch 'MDL-58991-master' of git://github.com/lameze/moodle