Merge branch 'wip-MDL-36317-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 7 Nov 2012 08:41:53 +0000 (16:41 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 7 Nov 2012 08:41:53 +0000 (16:41 +0800)
commit4b5a6b1327a4e4b8a21fe4b1eb75d1e503bd0b6f
tree32b5bea80ee808cf77854840fbdbf13c32017aeb
parent63fc21b4e51a83b83944e96263da5a92948b2e92
parent695705f5d42f4ef756d268f4e38de4f1fd437028
Merge branch 'wip-MDL-36317-master' of git://github.com/marinaglancy/moodle

Conflicts:
course/format/lib.php
course/format/lib.php