Merge branch 'wip-MDL-45037-master' of git://github.com/abgreeve/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 21 Apr 2014 21:59:01 +0000 (09:59 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 21 Apr 2014 21:59:01 +0000 (09:59 +1200)

Trivial merge