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)

Trivial merge