Merge branch 'w02_MDL-36988_m25_switchrole' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Jan 2013 01:27:48 +0000 (02:27 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Jan 2013 01:27:48 +0000 (02:27 +0100)
1  2 
course/view.php
lib/navigationlib.php

diff --cc course/view.php
Simple merge
Simple merge