Merge branch 'MDL-43390_master' of git://github.com/dmonllao/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 28 Jul 2014 00:22:40 +0000 (12:22 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 28 Jul 2014 00:22:40 +0000 (12:22 +1200)

Trivial merge