Merge branch 'w31_MDL-28473_m21_blocksupgrade' of git://github.com/skodak/moodle...
commit2e81c307d01c9187b31586284658909480d149a8
authorSam Hemelryk <sam@moodle.com>
Mon, 8 Aug 2011 02:03:07 +0000 (8 10:03 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 8 Aug 2011 02:03:07 +0000 (8 10:03 +0800)
tree9729ebefbb21a7ad72c163233828a4c7e26bcc21
parente24225351cb16cedfe6f01e4693a6380cc0bed4c
parente25df8c46494c2273c4063d8a69b6fc4addb3ae0
Merge branch 'w31_MDL-28473_m21_blocksupgrade' of git://github.com/skodak/moodle into MOODLE_21_STABLE