Merge branch 'wip-MDL-31948-master' of git://github.com/phalacee/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 8 May 2012 23:49:33 +0000 (11:49 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 8 May 2012 23:49:33 +0000 (11:49 +1200)

Trivial merge