Merge branch 'wip-MDL-30376-master' of git://github.com/phalacee/moodle
commit63a07688884ffc890a86cdfbc37eb9d4a6cb253e
authorSam Hemelryk <sam@moodle.com>
Thu, 1 Dec 2011 01:16:19 +0000 (1 14:16 +1300)
committerSam Hemelryk <sam@moodle.com>
Thu, 1 Dec 2011 01:16:19 +0000 (1 14:16 +1300)
tree9daeb6456aa9305e782eb153ce8fd43964b6c6f6
parentc3f185949fd8481e0f1a41fec83c2c77fecb7c8e
parent1a9528e010bf9bfb805e1d4637ee0d5fddd224ce
Merge branch 'wip-MDL-30376-master' of git://github.com/phalacee/moodle