Merge branch 'MDL-57821-master' of git://github.com/jleyva/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 5 Apr 2017 01:39:02 +0000 (09:39 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 5 Apr 2017 01:39:02 +0000 (09:39 +0800)
commit458315f85774a3eb63560680b17a8279894a21f4
tree55f214246a3c7129382f2c6c7e6e012944a4fe3d
parent170a8b3ec45baee1095a76a239d262633c18f217
parenta24289f12fe7589045f2152785f59ce17c86f795
Merge branch 'MDL-57821-master' of git://github.com/jleyva/moodle