Merge branch 'MDL-41348' of git://github.com/timhunt/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 3 Sep 2013 08:09:29 +0000 (16:09 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 3 Sep 2013 08:09:29 +0000 (16:09 +0800)

Trivial merge