Merge branch 'MDL-58668-master' of git://github.com/jleyva/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 26 Apr 2017 03:06:30 +0000 (11:06 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 26 Apr 2017 03:06:30 +0000 (11:06 +0800)
commitabaf8106ea670c6c75b63e99d1b2f6df0640086e
tree68fa68d895bcd0940fb24ffe31d857ff3724530b
parent371482f881270874d3d85c5c232640d1b15c7d0c
parentd5eefdb6a073ad86c535f75dc3ec144cb22f897c
Merge branch 'MDL-58668-master' of git://github.com/jleyva/moodle