Merge branch 'wip-MDL-36048-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 14 Nov 2012 01:58:27 +0000 (09:58 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 14 Nov 2012 01:58:27 +0000 (09:58 +0800)
commit2d0d36f219550f146eef8270abf19ef3be4ec103
treedb1f062dea14e2c575dd8d77597be7f0b00c3beb
parent81d779899633be61a437043dcec3921fab363a26
parent52b1ed5ee8f160d923890b734ffd876792ff15da
Merge branch 'wip-MDL-36048-master' of git://github.com/marinaglancy/moodle
course/format/lib.php