Merge branch 'MDL-33099-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 17 Feb 2014 06:40:36 +0000 (14:40 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 17 Feb 2014 06:40:36 +0000 (14:40 +0800)
1  2 
admin/settings/appearance.php
lang/en/admin.php

Simple merge
Simple merge