Merge branch 'MDL-46031' of git://github.com/timhunt/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 24 Jun 2014 06:05:54 +0000 (14:05 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 24 Jun 2014 06:05:54 +0000 (14:05 +0800)

Trivial merge