Merge branch '26226-48304-29' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 2 Dec 2014 13:03:09 +0000 (13:03 +0000)
committerDan Poltawski <dan@moodle.com>
Thu, 4 Dec 2014 12:06:04 +0000 (12:06 +0000)
1  2 
course/format/topics/lib.php
course/format/weeks/lib.php
lang/en/admin.php

Simple merge
Simple merge
Simple merge