Merge branch 'wip-MDL-33928-master' of git://github.com/phalacee/moodle
commitc691963939655c65eb418e82715eea6c4d3d2197
authorSam Hemelryk <sam@moodle.com>
Thu, 21 Jun 2012 21:33:25 +0000 (22 09:33 +1200)
committerSam Hemelryk <sam@moodle.com>
Thu, 21 Jun 2012 21:33:25 +0000 (22 09:33 +1200)
treeb3db9bf6c30ab9e88ab9f59f0bec375a2cac91ab
parentc5541daf00fc14d7a8a1e16cc318aa0ea4565b40
parent3d24b287be10bc3347ef683a25b3be6ab4ea4117
Merge branch 'wip-MDL-33928-master' of git://github.com/phalacee/moodle