Merge branch 'MDL-43723-master-nomerge2' of git://github.com/mouneyrac/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 25 Feb 2014 08:43:56 +0000 (16:43 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 25 Feb 2014 08:43:56 +0000 (16:43 +0800)

Trivial merge