Merge branch 'wip-MDL-40871-master' of git://github.com/abgreeve/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 12 Aug 2013 20:57:15 +0000 (08:57 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 12 Aug 2013 20:57:15 +0000 (08:57 +1200)

Trivial merge