Merge branch 'MDL-58628-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 27 Apr 2017 04:19:20 +0000 (12:19 +0800)
committerDavid Monllao <davidm@moodle.com>
Thu, 27 Apr 2017 04:19:20 +0000 (12:19 +0800)
commitaabee00d58d0756460e88d41ba5d03a77dde41eb
tree63d3845190f4f598cf9b63fb15a428d7489f83bb
parent0b90afb59ef9a86435600f0127611a00fbc35bc6
parentbcd6249d5325025eb5c25c5b05192046eff4105e
Merge branch 'MDL-58628-master' of git://github.com/jleyva/moodle