Merge branch 'MDL-47529-master' of git://github.com/FMCorz/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 16 Feb 2015 03:52:50 +0000 (11:52 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 16 Feb 2015 03:52:50 +0000 (11:52 +0800)
commit470e087d80dc641897f1bcf74a5ccb812ff2bbdd
tree1286c73f1735cf7f6b6596700df9aa700eb3adb2
parent36977d39d0e485ad9ec88d153de97f6b622b9a31
parent308e481ce85b482cad4987f3fb67b007e4cc89c7
Merge branch 'MDL-47529-master' of git://github.com/FMCorz/moodle