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)
1  2 
course/format/lib.php
lib/navigationlib.php

Simple merge
Simple merge