Merge branch 'wip-MDL-39298-master' of git://github.com/abgreeve/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 28 Apr 2013 22:45:33 +0000 (10:45 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 28 Apr 2013 22:45:33 +0000 (10:45 +1200)

Trivial merge