Merge branch 'MDL-26953' of git://github.com/lazydaisy/moodle
commit22ca670f88c1de351b0043e81141663eec208119
authorSam Hemelryk <sam@moodle.com>
Mon, 17 Oct 2011 04:37:49 +0000 (17 17:37 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 17 Oct 2011 04:37:49 +0000 (17 17:37 +1300)
treefad1bb23bd2021512fe57a0031295ccd23886285
parent5f6de5dc6b3f558cf8db9cadd9b3384f20704688
parentd4bb76264391c21c2de109fdfc4feaefc20b6a6b
Merge branch 'MDL-26953' of git://github.com/lazydaisy/moodle