Merge branch 'MDL-57770-master' of git://github.com/lameze/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 20 Jun 2017 08:27:48 +0000 (16:27 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 20 Jun 2017 08:27:48 +0000 (16:27 +0800)
commitd938d1b6e2d542ace55b060dc6c6c207efa50c1f
tree4a9e73ed92c9964d17449f983596afff4ac89ec2
parent0ba61c3bf847f95b535f15be6bcd10c2599e9e02
parent7af8b56ab4644cb4688a6d1d3c78cfac8aeba20b
Merge branch 'MDL-57770-master' of git://github.com/lameze/moodle