Merge branch 'w49_MDL-30517_m22_blockdelete' of git://github.com/skodak/moodle
authorAparup Banerjee <aparup@moodle.com>
Wed, 30 Nov 2011 09:39:23 +0000 (17:39 +0800)
committerAparup Banerjee <aparup@moodle.com>
Wed, 30 Nov 2011 09:39:23 +0000 (17:39 +0800)

Trivial merge