Merge branch 'wip-MDL-27429-master' of git://github.com/Beedell/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 11 Jul 2011 05:54:49 +0000 (13:54 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 11 Jul 2011 05:54:49 +0000 (13:54 +0800)
commit42afcc172a426034914a84530dca1b1f64c227ef
treee8b5bbed28e163bb76ae2ce9c4d26969cd9d04fe
parentc9d0d331743ca36c2c4c0f21f27a1a71c831e9b4
parent7cf83f47cc6e9e358a263795c09198f84ee56df1
Merge branch 'wip-MDL-27429-master' of git://github.com/Beedell/moodle