Merge branch 'wip-MDL-35260-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 5 Nov 2012 07:04:25 +0000 (15:04 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 5 Nov 2012 07:04:25 +0000 (15:04 +0800)
commit1fc59b22ded953b1980427dfc2c7f5eb965ee0c6
treecae9d0111dec234dd7f37a15acf516cfda6fe48d
parent1872a0f26e0883152e4c4f8416c30283c5cc4d20
parent45f93db912a17b778aca4b9ced16de79ff18abaa
Merge branch 'wip-MDL-35260-master' of git://github.com/marinaglancy/moodle
course/format/lib.php
lib/moodlelib.php