Merge branch 'MDL-43347-master' of https://github.com/mackensen/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 7 Jul 2014 21:28:20 +0000 (09:28 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 7 Jul 2014 21:28:20 +0000 (09:28 +1200)
commit4264ed8454b0b976f6c7eec158ec660b1d5feb69
tree77c67e11aaef932e9f52de967028c48ddf417889
parent744c77c0578d1c68fd82c290f677ecf74866e348
parent30cc5d70ce717c38fd6053e314b7a6245b2e3513
Merge branch 'MDL-43347-master' of https://github.com/mackensen/moodle