Merge branch 'MDL-43448' of git://github.com/timhunt/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 7 Jan 2014 01:22:27 +0000 (09:22 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 7 Jan 2014 01:22:27 +0000 (09:22 +0800)

Trivial merge