Merge branch 'w46_MDL-30327_m22_blockconfig' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 20 Nov 2011 22:48:47 +0000 (11:48 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 20 Nov 2011 22:48:47 +0000 (11:48 +1300)
commitb8c117e1267b42ee7ef2098903d96c8067a4c209
treed5acabbdebb63f969abde1f7b14cdee6b5bb785e
parenteb3217dc40fff9b3d85fb9607bb1fbc3f869ff3c
parent544832790dc154ea3711d42c3e6dd3e2b0812972
Merge branch 'w46_MDL-30327_m22_blockconfig' of git://github.com/skodak/moodle