Merge branch 'wip-MDL-28292-master' of git://github.com/phalacee/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 6 Nov 2011 23:24:26 +0000 (12:24 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 6 Nov 2011 23:24:26 +0000 (12:24 +1300)

Trivial merge