Merge branch 'MDL-39246' of git://github.com/timhunt/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 30 Apr 2013 04:02:36 +0000 (12:02 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 30 Apr 2013 04:02:36 +0000 (12:02 +0800)

Trivial merge