Merge branch 'wip-MDL-33774-master' of git://github.com/marinaglancy/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 19 Feb 2013 04:36:40 +0000 (12:36 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 19 Feb 2013 04:36:40 +0000 (12:36 +0800)

Trivial merge