Merge branch 'wip-MDL-35279-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 7 Nov 2012 06:44:26 +0000 (14:44 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 7 Nov 2012 06:44:26 +0000 (14:44 +0800)
commit53b6a75a99752a9639db27da76ef731125744400
treea67ff5f8615de6730f8baf1ed6c397f63c9d7678
parent5c6d2b1480556d79a4aff3a7ae70a9eff6f59a72
parente010b8503eeb66c1ccee7a1f23d13b99156e7c6c
Merge branch 'wip-MDL-35279-master' of git://github.com/marinaglancy/moodle
course/format/lib.php
lib/navigationlib.php