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)
commitf5e0cb117ae388f40e6d4d18ee9818845638371c
treedda9185214c23f5c0425ed95335a36ca7169140c
parent40e85f3cd86377ff3de14e6bffca8101b587c94b
parent1ef135e77307fa8d0c3deebdb4c30ae0b0d5354f
Merge branch 'MDL-52975-master-mnet-context' of git://github.com/mudrd8mz/moodle