Merge branch 'wip-MDL-27622-master' of git://github.com/samhemelryk/moodle
authorSam Hemelryk <sam@moodle.com>
Fri, 11 Nov 2011 05:35:13 +0000 (18:35 +1300)
committerSam Hemelryk <sam@moodle.com>
Fri, 11 Nov 2011 05:35:13 +0000 (18:35 +1300)

Trivial merge