Merge branch 'MDL-33842_antivirus_message' of git://github.com/davosmith/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 19 Jun 2012 13:52:27 +0000 (21:52 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 19 Jun 2012 13:52:27 +0000 (21:52 +0800)

Trivial merge