Merge branch 'wip-MDL-32199-master' of git://github.com/abgreeve/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 28 May 2012 07:18:51 +0000 (15:18 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 28 May 2012 07:18:51 +0000 (15:18 +0800)

Trivial merge