Merge branch 'MDL-47667' of git://github.com/timhunt/moodle
authorDamyon Wiese <damyon@moodle.com>
Thu, 16 Oct 2014 05:00:22 +0000 (13:00 +0800)
committerDamyon Wiese <damyon@moodle.com>
Thu, 16 Oct 2014 05:00:22 +0000 (13:00 +0800)

Trivial merge