Merge branch 'wip-MDL-30971-master' of git://github.com/phalacee/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 19 Feb 2012 22:37:59 +0000 (11:37 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 19 Feb 2012 22:37:59 +0000 (11:37 +1300)

Trivial merge