Merge branch 'wip-mdl-35873' of git://github.com/rajeshtaneja/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 16 Jan 2013 05:22:04 +0000 (18:22 +1300)
committerSam Hemelryk <sam@moodle.com>
Wed, 16 Jan 2013 05:22:04 +0000 (18:22 +1300)
1  2 
lib/blocklib.php

Simple merge