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)
1  2 
theme/clean/layout/columns1.php
theme/clean/layout/columns2.php

Simple merge
Simple merge