Merge branch 'wip-MDL-34318-master' of git://github.com/abgreeve/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 2 Sep 2012 22:12:50 +0000 (10:12 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 2 Sep 2012 22:12:50 +0000 (10:12 +1200)

Trivial merge