Merge branch 'MDL-31255-master-3' of git://git.luns.net.uk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 6 Mar 2012 23:18:27 +0000 (00:18 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 6 Mar 2012 23:18:27 +0000 (00:18 +0100)
1  2 
course/format/topics/format.php
course/lib.php

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