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)
1  2 
admin/renderer.php

Simple merge