Merge branch 'wip-MDL-40621-master' of git://github.com/marinaglancy/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 16 Jul 2013 13:29:58 +0000 (21:29 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 16 Jul 2013 13:29:58 +0000 (21:29 +0800)

Trivial merge