Merge branch 'MDL-43399-master' of git://github.com/mouneyrac/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 6 Jan 2014 08:13:44 +0000 (16:13 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 6 Jan 2014 08:13:44 +0000 (16:13 +0800)

Trivial merge