Merge branch 'MDL-28568_noncontact_warning_23' of git://github.com/andyjdavis/moodle...
authorSam Hemelryk <sam@moodle.com>
Tue, 31 Jul 2012 00:00:42 +0000 (12:00 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 31 Jul 2012 00:00:42 +0000 (12:00 +1200)

Trivial merge