Merge branch 'MDL-37564' of https://github.com/nebgor/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 3 Sep 2013 06:49:42 +0000 (14:49 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 3 Sep 2013 06:49:42 +0000 (14:49 +0800)
1  2 
admin/renderer.php

Simple merge