Merge branch 'MDL-54623-master' of git://github.com/junpataleta/moodle
authorDavid Monllao <davidm@moodle.com>
Fri, 20 May 2016 02:36:07 +0000 (10:36 +0800)
committerDavid Monllao <davidm@moodle.com>
Fri, 20 May 2016 02:36:07 +0000 (10:36 +0800)
commit2be707cb5e07146fb8c06cda1abe4435145b4bee
tree68b0fe91a7f0f8b04e4ccab2c81a944114f841bb
parent3d562d19b9e0c6bfcdf786512a29a1a35b182ec9
parent5684c89b937092552dd06c592a975eea9deff4c7
Merge branch 'MDL-54623-master' of git://github.com/junpataleta/moodle