Merge branch 'MDL-24419-master' of git://github.com/sammarshallou/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 17 May 2012 12:45:37 +0000 (20:45 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 17 May 2012 12:45:37 +0000 (20:45 +0800)
commit6e0d17693445435953e9ead532dea836c45f169d
tree06e0e2c0fb65819e9a4857d1d7a39b0430a70b7e
parentffa7d1cda07dce44a806fa7a42a7b20a6f5e4ec6
parent52f1406101293f40c19b219d800dde496a3d836b
Merge branch 'MDL-24419-master' of git://github.com/sammarshallou/moodle
course/format/renderer.php
course/lib.php