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)
commitbb77ead0a455404b35d354970c26dcd99972524c
tree881e8ce737b702e0471e620f275e5299dbb267d8
parentc607258ae4b1facf78c4d5d25d5f54e71a3553f8
parent93d46f48020ea96edb7ddf77dfa9b9edb039e382
Merge branch 'MDL-31255-master-3' of git://git.luns.net.uk/moodle
course/format/topics/format.php
course/lib.php