Merge branch 'MDL-43733' of git://github.com/timhunt/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 20 Jan 2014 02:02:40 +0000 (10:02 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 20 Jan 2014 02:02:40 +0000 (10:02 +0800)

Trivial merge