Merge branch 'MDL-29977-mnet-masquerade' of git://github.com/mudrd8mz/moodle
authorAparup Banerjee <aparup@moodle.com>
Wed, 9 Nov 2011 05:40:24 +0000 (13:40 +0800)
committerAparup Banerjee <aparup@moodle.com>
Wed, 9 Nov 2011 05:40:24 +0000 (13:40 +0800)

Trivial merge