Merge branch 'w51_MDL-36893_m23_mnetestrict' of git://github.com/skodak/moodle into...
authorDan Poltawski <dan@moodle.com>
Mon, 7 Jan 2013 05:53:29 +0000 (13:53 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 7 Jan 2013 05:53:29 +0000 (13:53 +0800)

Trivial merge