Merge branch 'wip-MDL-32862-master' of git://github.com/abgreeve/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 9 Sep 2013 21:38:46 +0000 (09:38 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 9 Sep 2013 21:38:46 +0000 (09:38 +1200)

Trivial merge