Merge branch 'w31_MDL-28473_m22_blocksupgrade' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 8 Aug 2011 01:59:42 +0000 (09:59 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 8 Aug 2011 01:59:42 +0000 (09:59 +0800)
commit7d405fe7c8c8ad411a53e553adbd463f6c6636d7
tree16611aec39dccad6a10f908d68bdae37c4167787
parent639ab4d5c58f4b73c4102c56de10627be9b75ca9
parent79cfcd3f7d865d9de8fe308a9724eda1f7213595
Merge branch 'w31_MDL-28473_m22_blocksupgrade' of git://github.com/skodak/moodle