Merge branch 'MDL-36948-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 3 Dec 2012 03:59:01 +0000 (11:59 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 3 Dec 2012 03:59:01 +0000 (11:59 +0800)
commitf92340ed3f36300cb065e2b0afd0457d8cf86abc
tree3c6acb6fd6791fcaa2747ee98a5abba962798918
parent28ef36f018003af8a530ddc5a1536e43491c87bb
parentc2e10ac08a3b637ff2d3ec5850c202142a6567bd
Merge branch 'MDL-36948-master' of git://github.com/FMCorz/moodle
admin/renderer.php