Merge branch 'mdl45982-master' of https://github.com/tlock/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 8 Jul 2014 01:26:36 +0000 (13:26 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 8 Jul 2014 01:26:36 +0000 (13:26 +1200)
commit189f9937ad7a1dff8187a271f039b92f657ca577
tree54e2ef4644d7f26a0ac5c20c6aae5eb36a198ccf
parentbac04a65bbd7fa1f6e35cf6089f8fba3c583844d
parent1dbc4f289400bad5b9cfa2db6cf7b93f9fc2dafc
Merge branch 'mdl45982-master' of https://github.com/tlock/moodle