Merge branch 'MDL-40443' of git://github.com/timhunt/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 9 Jul 2013 07:15:47 +0000 (15:15 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 9 Jul 2013 07:15:47 +0000 (15:15 +0800)

Trivial merge