Merge branch 'MDL-44269_master' of git://github.com/lazydaisy/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 24 Feb 2014 03:42:51 +0000 (11:42 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 24 Feb 2014 03:42:51 +0000 (11:42 +0800)
commit25de7d88e76ce74b95625baa5ce771600ac0299f
treeac06196943c951b619586e4a8175848dd1147493
parentaeacaa141e5bc81830add2e3bf5f2b214953d878
parente11558bca3aaffff6e01be5172bb0d804a176961
Merge branch 'MDL-44269_master' of git://github.com/lazydaisy/moodle
theme/clean/layout/columns1.php
theme/clean/layout/columns2.php