Merge branch 'wip-mdl-32218' of git://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 16 Oct 2012 06:35:28 +0000 (14:35 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 16 Oct 2012 06:35:28 +0000 (14:35 +0800)
1  2 
lib/blocklib.php

Simple merge