Merge branch 'MDL-32337-uptodate' of git://github.com/mudrd8mz/moodle
authorSam Hemelryk <sam@moodle.com>
Thu, 17 May 2012 02:55:21 +0000 (14:55 +1200)
committerSam Hemelryk <sam@moodle.com>
Thu, 17 May 2012 02:55:21 +0000 (14:55 +1200)
1  2 
admin/renderer.php
lang/en/admin.php

Simple merge
Simple merge