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)
commit2bdafb867a130b989899dd424578c921f767bfc3
tree008e9fcdccf5c4e136d9fda3426a6978e7915050
parentb9453253390af24dcd4f8c56daa6869b0cb7f83e
parentcb1c32918607ca59223196e927af88c68133e575
Merge branch 'MDL-32337-uptodate' of git://github.com/mudrd8mz/moodle
admin/renderer.php
lang/en/admin.php