Merge branch 'wip-MDL-40619-master' of git://github.com/marinaglancy/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 25 Feb 2014 02:53:09 +0000 (10:53 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 25 Feb 2014 02:53:09 +0000 (10:53 +0800)

Trivial merge