Merge branch 'MDL-52429-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 21 Dec 2015 09:16:54 +0000 (17:16 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 21 Dec 2015 09:16:54 +0000 (17:16 +0800)
commit355570f9e76c16462f32b56cad87039a1c34ea40
treed1e900d1c31a02058ddc886664835e63c69fc101
parent20b3638322fa123dd8beaaf565488e33a134fe15
parenta6c11677a882b1a07781fe9695fd1a44ff588cc5
Merge branch 'MDL-52429-master' of git://github.com/jleyva/moodle