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)
commit20a31993978c59255473f6508d3327716633fa35
tree840c54fb464dcdfbb8f96cfb66dac4fda3d30872
parent7acc743f061da4e3e0de10795c585b0f6672b53d
parent9309a8fe9a958a1886e2d8e9abf3b6447d53df64
Merge branch 'wip-mdl-35873' of git://github.com/rajeshtaneja/moodle
lib/blocklib.php