Merge branch 'MDL-52975-master-mnet-context' of git://github.com/mudrd8mz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Feb 2016 21:57:45 +0000 (22:57 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Feb 2016 21:57:45 +0000 (22:57 +0100)

Trivial merge