Merge branch 'wip-MDL-30010' of git://github.com/lazydaisy/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 13 Nov 2011 23:10:17 +0000 (12:10 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 13 Nov 2011 23:10:17 +0000 (12:10 +1300)
1  2 
lib/blocklib.php
theme/canvas/style/pagelayout.css

Simple merge
Simple merge