Merge branch 'MDL-23514-master' of https://github.com/danielneis/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 17 Feb 2014 06:12:16 +0000 (14:12 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 17 Feb 2014 06:12:16 +0000 (14:12 +0800)
commit8053854592571abace08ce7b493ca264a61e0e1e
treefae0a10a8119ec25310b4dae7ebedbd7d59e5b1d
parent09c7f57fd2e57eb7b99388d71360257860f90adf
parent9452cae8ddcfca63c2f09d5098370c22c1920768
Merge branch 'MDL-23514-master' of https://github.com/danielneis/moodle

Conflicts:
lang/en/admin.php
admin/settings/appearance.php
lang/en/admin.php
lib/setuplib.php