Merge branch 'w29_MDL-27994_m22_creatorcaps' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 25 Jul 2011 02:45:20 +0000 (10:45 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 25 Jul 2011 02:45:20 +0000 (10:45 +0800)
commit0e7f782eb4242d68a94691616a187c06c24dd792
treec3b6a43dbcb3b07a1eb84c5a1567c73c3a4071ca
parent1092bd6db43b21f321541fbaa9c2ec8f6bf0e1c4
parent88d823c1f491a3c74f67bbf74306a8d1109dee02
Merge branch 'w29_MDL-27994_m22_creatorcaps' of git://github.com/skodak/moodle