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

Simple merge