Merge branch 'wip-MDL-47629-master' of https://github.com/kwiliarty/moodle
commitedfeca582ec7387821ca95f7b9b493f3cb46d99c
authorSam Hemelryk <sam@moodle.com>
Wed, 15 Oct 2014 21:31:20 +0000 (16 10:31 +1300)
committerSam Hemelryk <sam@moodle.com>
Wed, 15 Oct 2014 21:31:20 +0000 (16 10:31 +1300)
tree5a74c24122c576e29513d53c522626625094e828
parentb1b29992069f1ac897b4352878e586b6054c0d46
parent3d1c2898c10bf7d1d6b1fb505143a8d63fdfceeb
Merge branch 'wip-MDL-47629-master' of https://github.com/kwiliarty/moodle