Merge branch 'MDL-33731-master-1' of git://git.luns.net.uk/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 15 Jun 2012 04:10:34 +0000 (12:10 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 15 Jun 2012 04:10:34 +0000 (12:10 +0800)

Trivial merge