Merged branch 'MDL-28575_master' of git://github.com/kordan/moodle.git with conflict...
authorSam Hemelryk <sam@moodle.com>
Mon, 8 Aug 2011 05:58:10 +0000 (13:58 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 8 Aug 2011 05:58:10 +0000 (13:58 +0800)
commit0d38abcf38a09e8bc28ac0b7cac700589e75aad4
tree2d8708c33765fef5bd725eb343c49d1d463ffa69
parent9e4b5b45a497cc251a27febda31599d640eb35ef
parent34497bd33e2df62a96f5a1174e6118f4dc6f0490
Merged branch 'MDL-28575_master' of git://github.com/kordan/moodle.git with conflict resolution
theme/formal_white/style/formal_white.css