Merge branch 'MDL-31635-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 25 Jan 2016 04:24:59 +0000 (12:24 +0800)
committerDavid Monllao <davidm@moodle.com>
Fri, 29 Jan 2016 02:15:15 +0000 (10:15 +0800)
commit9edcfdad4f375d54e391369f201f709c95a06de7
tree17ae42c8c832cae510806f2319efae352ce98c33
parenteddec36d4925850d78ba95b7e0175cf671196a78
parent5824335f80f7694c094fa7c39d4180d3da986db6
Merge branch 'MDL-31635-master' of git://github.com/marinaglancy/moodle