Merge branch 'w24_MDL-33182_m23_mnetstrict' of git://github.com/skodak/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 12 Jun 2012 09:10:54 +0000 (17:10 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 12 Jun 2012 09:10:54 +0000 (17:10 +0800)

Trivial merge