Merge branch 'MDL-30340-sticky-blocks_simplify_frontpage_ui' of git://github.com...
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 5 Dec 2011 09:57:53 +0000 (10:57 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 5 Dec 2011 09:57:53 +0000 (10:57 +0100)
1  2 
lib/blocklib.php

Simple merge