Merge branch 'MDL-54661-master' of git://github.com/junpataleta/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 23 May 2016 06:23:57 +0000 (14:23 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 23 May 2016 06:23:57 +0000 (14:23 +0800)
commitec7ade95db7b7e370496a8304de3d3d4db97c2b7
tree91029045c7b1ed70258b7593c23dce7f160cac7f
parent170402cb4ef7452506637dbfa39a381aad21e43c
parent7af009633a23728b42d6868cf9d990ab91bb8774
Merge branch 'MDL-54661-master' of git://github.com/junpataleta/moodle