Merge branch 'MDL-41364' of git://github.com/timhunt/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 27 Aug 2013 08:31:36 +0000 (16:31 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 27 Aug 2013 08:31:36 +0000 (16:31 +0800)

Trivial merge