Merge branch 'MDL-45847_master' of https://github.com/Syxton/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 21 Jul 2014 11:09:10 +0000 (12:09 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 21 Jul 2014 11:09:10 +0000 (12:09 +0100)
1  2 
course/classes/management_renderer.php
course/management.php
lang/en/moodle.php

Simple merge
Simple merge