Merge branch 'MDL-59785-master' of git://github.com/lameze/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 14 Aug 2017 08:56:08 +0000 (16:56 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 14 Aug 2017 08:56:08 +0000 (16:56 +0800)
commit993ccc7268a38c250353a35b3bd4baa27ebb00f0
treeb142505d1de37e12315ccfc0520385015a86ecf5
parent28368da79449d8933d439180bbd6e0c7e2f63935
parent1c729ff624d608d26f00d75dc683b26bc336a843
Merge branch 'MDL-59785-master' of git://github.com/lameze/moodle