From: Sam Hemelryk <sam@moodle.com>
Date: Mon, 25 Jul 2011 02:45:20 +0000 (+0800)
Subject: Merge branch 'w29_MDL-27994_m22_creatorcaps' of git://github.com/skodak/moodle
X-Git-Tag: v2.2.0-beta~650
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=0e7f782eb4242d68a94691616a187c06c24dd792

Merge branch 'w29_MDL-27994_m22_creatorcaps' of git://github.com/skodak/moodle
---

0e7f782eb4242d68a94691616a187c06c24dd792