Merge branch 'MDL-58716-master' of git://github.com/jleyva/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 5 Jul 2017 01:36:41 +0000 (09:36 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 5 Jul 2017 01:36:41 +0000 (09:36 +0800)
commita50089bac53d07aa2f27f8a6772f35f83633b1c0
tree595628f4ca8b75f40790335f7fcf80a1fba82fe6
parent39f8a9636e7947cdbf012cd9f9e68ff0ac1a81d7
parentb6f70a3745b723494cd453257681d46528dc234a
Merge branch 'MDL-58716-master' of git://github.com/jleyva/moodle