Merged branch 'MDL-28460_master' of git://github.com/kordan/moodle.git with conflict...
authorSam Hemelryk <sam@moodle.com>
Mon, 29 Aug 2011 00:13:40 +0000 (12:13 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 29 Aug 2011 00:13:40 +0000 (12:13 +1200)
commit1924a86afaeca2ea4a60a563250c1a32e6579c03
treed05dfbf4cf98c749727b0f455959ac8113ab9cf8
parent6843dea2e9d2e1960592075f40cb0a2bf8240c29
parente0523b972901a140f7c0195648c154a2a2a382b8
Merged branch 'MDL-28460_master' of git://github.com/kordan/moodle.git with conflict resolution
theme/formal_white/lang/en/theme_formal_white.php
theme/formal_white/layout/frontpage.php
theme/formal_white/layout/general.php
theme/formal_white/settings.php