Merge branch 'wip_MDL-46728_master' of git://github.com/gjb2048/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 3 Feb 2015 03:45:15 +0000 (11:45 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 3 Feb 2015 03:45:15 +0000 (11:45 +0800)
commita5b4cc9635a92ffc086aa320b3fd3c0db417734b
treed0d18b87c34239f158514368cf6e11840073b721
parent9afe4eb55639bf6396492b65a6441c8e1bf530da
parenteb1861983aa930e55453a38a0413755b678a7e3e
Merge branch 'wip_MDL-46728_master' of git://github.com/gjb2048/moodle