Merge branch 'MDL-38280' of git://github.com/timhunt/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 5 Mar 2013 06:10:00 +0000 (14:10 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 5 Mar 2013 06:10:00 +0000 (14:10 +0800)

Trivial merge