Merge branch 'MDL-47003-master' of git://github.com/merrill-oakland/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 24 Mar 2015 02:17:28 +0000 (10:17 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 24 Mar 2015 02:17:28 +0000 (10:17 +0800)
commitb6f7863e77ccd44d617fa4301c840ab8f07807b9
treea65b6c30cda5b5b5e2063b6371864878429243ed
parent6ae45106fc0c25abc1efa01bcbed3235946717cd
parent3ef963619073ddcf9827151e6cbce18cb4c93829
Merge branch 'MDL-47003-master' of git://github.com/merrill-oakland/moodle