Merge branch 'MDL-41036' of git://github.com/timhunt/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 20 Aug 2013 04:55:31 +0000 (12:55 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 20 Aug 2013 04:55:31 +0000 (12:55 +0800)

Trivial merge