Merge branch 'MDL-43063-master' of git://github.com/lameze/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 21 Jul 2014 21:49:03 +0000 (09:49 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 21 Jul 2014 21:49:03 +0000 (09:49 +1200)

Trivial merge