Merge branch 'MDL-44288' of git://github.com/timhunt/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 24 Feb 2014 05:27:12 +0000 (13:27 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 24 Feb 2014 05:27:12 +0000 (13:27 +0800)

Trivial merge