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)
commita24ef7d7cdbbb39291799eb6638eecf7e09dce88
tree658adf560ae02e5380f05fc3ba1f8b5c5f5a4003
parent4339015aca77bbf30928c9a98b2a117f364c5a37
parentaf64bc6179bd258d9f085b0d16250f4d82d2c230
Merge branch 'MDL-33099-master' of git://github.com/andrewnicols/moodle
admin/settings/appearance.php
lang/en/admin.php