Merge branch 'wip-MDL-30059-master' of git://github.com/phalacee/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 8 Nov 2011 00:00:00 +0000 (13:00 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 8 Nov 2011 00:00:00 +0000 (13:00 +1300)

Trivial merge