Merge branch 'MDL-32744-master-3' of git://git.luns.net.uk/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 22 May 2012 04:28:37 +0000 (12:28 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 22 May 2012 04:28:37 +0000 (12:28 +0800)

Trivial merge