Merge branch 'MDL-58621-master-fix' of git://github.com/lameze/moodle
commitf0de5c55006ddc0a7e9c0a77ea094e78dc5878d8
authorDavid Monllao <davidm@moodle.com>
Fri, 21 Apr 2017 06:30:52 +0000 (21 14:30 +0800)
committerDavid Monllao <davidm@moodle.com>
Fri, 21 Apr 2017 06:30:52 +0000 (21 14:30 +0800)
treec75540498fc13817c47a53e52efe0848d9de6035
parent35ec6bebaaa877e7b4d8d00daacd298a299f3365
parent55c64521a8c5b2b54f4f0325ed01c2d177414267
Merge branch 'MDL-58621-master-fix' of git://github.com/lameze/moodle