Merge branch 'MDL-33019-master-2' of git://git.luns.net.uk/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 5 Jun 2012 07:32:45 +0000 (15:32 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 5 Jun 2012 07:32:45 +0000 (15:32 +0800)

Trivial merge