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)

Trivial merge