Merge branch 'w47_MDL-36547_m24_sectiongen' of git://github.com/skodak/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 21 Nov 2012 07:26:15 +0000 (15:26 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 21 Nov 2012 07:26:15 +0000 (15:26 +0800)
1  2 
course/lib.php
lib/phpunit/tests/generator_test.php

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