Merge branch 'MDL-47646' of git://github.com/timhunt/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 15 Oct 2014 06:26:49 +0000 (14:26 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 15 Oct 2014 06:26:49 +0000 (14:26 +0800)

Trivial merge