Merge branch 'MDL-42624-master' of git://github.com/mouneyrac/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 6 Nov 2013 08:00:33 +0000 (16:00 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 6 Nov 2013 08:00:33 +0000 (16:00 +0800)

Trivial merge