From: Sam Hemelryk <sam@moodle.com>
Date: Mon, 8 Aug 2011 01:59:42 +0000 (+0800)
Subject: Merge branch 'w31_MDL-28473_m22_blocksupgrade' of git://github.com/skodak/moodle
X-Git-Tag: v2.2.0-beta~591
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=7d405fe7c8c8ad411a53e553adbd463f6c6636d7;hp=-c

Merge branch 'w31_MDL-28473_m22_blocksupgrade' of git://github.com/skodak/moodle
---

7d405fe7c8c8ad411a53e553adbd463f6c6636d7