Merge branch 'wip-MDL-18128-master-version3' of git://github.com/abgreeve/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 21 Dec 2011 22:44:11 +0000 (11:44 +1300)
committerSam Hemelryk <sam@moodle.com>
Wed, 21 Dec 2011 22:44:11 +0000 (11:44 +1300)

Trivial merge