Merge branch 'MDL-47002-master' of git://github.com/merrill-oakland/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 23 Mar 2015 06:59:05 +0000 (14:59 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 23 Mar 2015 06:59:05 +0000 (14:59 +0800)
commit2572356895c8d935ce77ad4e634d932bc3ace463
tree9306c071bc83454cb5c7b6506cd16adc03feb415
parentb191360fea8c7c0019f4d1e5f3fbd566b817b69b
parenta7fdadc94cfe97faf95ecbfb0be7a9651546bbe0
Merge branch 'MDL-47002-master' of git://github.com/merrill-oakland/moodle