Merge branch 'MDL-44018' of git://github.com/timhunt/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 17 Feb 2014 01:14:46 +0000 (09:14 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 17 Feb 2014 01:14:46 +0000 (09:14 +0800)

Trivial merge