Merge branch 'w03_MDL-36602_m25_mnetuser' of git://github.com/skodak/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 22 Jan 2013 07:44:28 +0000 (15:44 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 22 Jan 2013 07:44:28 +0000 (15:44 +0800)

Trivial merge